diff --git a/configuration/common.nix b/configuration/common.nix
index 3d2bdc0372a04e959f4f82f909c333b5012c85eb..2d706678b6e59cff17c54a4708fe79472d9be5d2 100644
--- a/configuration/common.nix
+++ b/configuration/common.nix
@@ -10,15 +10,32 @@ final: prev: {
 
   Cabal-tree-diff = null;
 
+  base64-bytestring-type = null;
+
   digest = addExtraLibrary prev.digest pkgs.zlib;
 
+  digits = overrideCabal
+    prev.digits
+    (_:
+      {
+        patches = [
+          ./patches/digits-01.patch
+        ];
+      });
+
+  ghcide-bench = null;
+
+  ghcide-test-utils = null;
+
+  fourmolu = null;
+
   hopenssl = prev.hopenssl.override { openssl = pkgs.openssl; };
 
   libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
 
   saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
 
-  splitmix = prev.callPackage ../pkgs/splitmix.nix { inherit (pkgs) testu01; };
+  sandwich = null;
 
   text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
 
@@ -51,5 +68,4 @@ final: prev: {
 
   X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ];
 
-  zlib = prev.callPackage ../pkgs/zlib.nix { inherit (pkgs) zlib; };
 }
diff --git a/configuration/patches/digits-01.patch b/configuration/patches/digits-01.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b94b5a80581094d094385b6793b262617514d7d5
--- /dev/null
+++ b/configuration/patches/digits-01.patch
@@ -0,0 +1,18 @@
+commit 1217673c07de672edee01d1befb7243ec2de6ca6
+Author: Daniel Firth <dan.firth@homotopic.tech>
+Date:   Sat Nov 4 10:32:11 2023 +0000
+
+    fix build
+
+diff --git a/Setup.lhs b/Setup.lhs
+index 384dfce..76660fd 100644
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -2,6 +2,5 @@
+ 
+ > import Distribution.Simple
+ > import System.Cmd
+-> tests _ _ _ _ = system "runhaskell src/Tests.hs" >> return ()
+-> main = defaultMainWithHooks (simpleUserHooks {runTests = tests})
++> main = defaultMainWithHooks simpleUserHooks
+ 
diff --git a/develop/flake.lock b/develop/flake.lock
index 9cc0745d36a2099b0dcbc70704fa62a29ba31b93..4fcbac4071adf436f07cafc87af9a6a5cd82a3c2 100644
--- a/develop/flake.lock
+++ b/develop/flake.lock
@@ -577,16 +577,16 @@
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1698091055,
-        "narHash": "sha256-RxZRtv/ccP9lwcU54OQCFfgWK8C8eyKSbT+vW6Bl7ck=",
-        "ref": "refs/tags/0.11.0",
-        "rev": "0f5e5bad673d0c977246e6d96f39a6867e04fad3",
-        "revCount": 190,
+        "lastModified": 1697280312,
+        "narHash": "sha256-GXjT8XYd0OvyKKnDJjK1w8ler2tN41lvK/dHCeELhGY=",
+        "ref": "refs/tags/0.10.4",
+        "rev": "d57f6cd65403e0b8a404088384fd646ac85fb713",
+        "revCount": 181,
         "type": "git",
         "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix"
       },
       "original": {
-        "ref": "refs/tags/0.11.0",
+        "ref": "refs/tags/0.10.4",
         "type": "git",
         "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix"
       }
diff --git a/develop/flake.nix b/develop/flake.nix
index 6e16f010878856191d14b30bc56c2b8ce84d9b95..b86eb432a1f06496db8464437d49de0685fe85f9 100644
--- a/develop/flake.nix
+++ b/develop/flake.nix
@@ -9,7 +9,7 @@
     feedback.url = "github:NorfairKing/feedback";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-to-gitlab-ci.url = "git+https://gitlab.nixica.dev/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.4.2";
-    horizon-gen-nix.url = "git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.11.0";
+    horizon-gen-nix.url = "git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.10.4";
     horizon-shell.url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.9";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
diff --git a/flake.lock b/flake.lock
index dec7e73073831c7c6e9f3d5154add03bab41d7cc..52d69b7f55249996c508d5cc9ed43c6159a6e7a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,109 +66,27 @@
         "type": "github"
       }
     },
-    "get-flake": {
-      "locked": {
-        "lastModified": 1694475786,
-        "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=",
-        "owner": "ursi",
-        "repo": "get-flake",
-        "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ursi",
-        "repo": "get-flake",
-        "type": "github"
-      }
-    },
-    "get-flake_2": {
-      "locked": {
-        "lastModified": 1694475786,
-        "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=",
-        "owner": "ursi",
-        "repo": "get-flake",
-        "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ursi",
-        "repo": "get-flake",
-        "type": "github"
-      }
-    },
     "horizon-core": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "get-flake": "get-flake_2",
-        "horizon-gen-nix-flake-source": "horizon-gen-nix-flake-source",
-        "horizon-shell-flake-source": "horizon-shell-flake-source",
         "lint-utils": "lint-utils",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1699032498,
-        "narHash": "sha256-tD/DqwksZDVbgKAA8drIResvOlKN2r7j7j8qUnikiJg=",
-        "ref": "sts-945",
-        "rev": "ad6a41b3034916db3cc389d1ab06de33b03f6e2f",
-        "revCount": 1068,
+        "lastModified": 1699043048,
+        "narHash": "sha256-s66alk5vDvyvmMm8HqBqnqTI/qJN401X3N/P9scbV/A=",
+        "ref": "lts/ghc-9.4.x",
+        "rev": "e0f3d370590ed74e733741b947492702dab286ae",
+        "revCount": 1180,
         "type": "git",
         "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
       },
       "original": {
-        "ref": "sts-945",
+        "ref": "lts/ghc-9.4.x",
         "type": "git",
         "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
       }
     },
-    "horizon-gen-nix-flake-source": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1698091055,
-        "narHash": "sha256-RxZRtv/ccP9lwcU54OQCFfgWK8C8eyKSbT+vW6Bl7ck=",
-        "ref": "refs/heads/master",
-        "rev": "0f5e5bad673d0c977246e6d96f39a6867e04fad3",
-        "revCount": 190,
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix"
-      }
-    },
-    "horizon-shell-flake": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1679524452,
-        "narHash": "sha256-xzNxvLVa3o0F/z4CnBDORv2Y6PfxjlGv7b7LybIyCSg=",
-        "ref": "refs/tags/0.0.8",
-        "rev": "21b8913803cefeb287bb244c7ee335638233db7f",
-        "revCount": 21,
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
-      },
-      "original": {
-        "ref": "refs/tags/0.0.8",
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
-      }
-    },
-    "horizon-shell-flake-source": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697281965,
-        "narHash": "sha256-VWAJWUyI3PI/7UKVJ9hkQNrC/NMcUHsqzMayAbfbXZc=",
-        "ref": "refs/heads/master",
-        "rev": "3201b990c51f924838c244cb5d8c5b1ba7b134c8",
-        "revCount": 36,
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
-      }
-    },
     "lint-utils": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -310,9 +228,7 @@
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "get-flake": "get-flake",
         "horizon-core": "horizon-core",
-        "horizon-shell-flake": "horizon-shell-flake",
         "lint-utils": "lint-utils_2",
         "nixpkgs": "nixpkgs_4"
       }
diff --git a/flake.nix b/flake.nix
index c0d9d488a01308d599ee21daa70388a52d82e645..f57aca3db9e37e22e186c4681953155a65f669d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,8 @@
   };
 
   inputs = {
-    get-flake.url = "github:ursi/get-flake";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    horizon-core.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-core?ref=sts-945";
-    horizon-shell-flake = {
-      url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.8";
-      flake = false;
-    };
+    horizon-core.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-core?ref=lts/ghc-9.4.x";
     lint-utils.url = "git+https://gitlab.nixica.dev/nix/lint-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
@@ -22,16 +17,18 @@
   outputs =
     inputs@
     { self
-    , get-flake
     , flake-parts
     , horizon-core
-    , horizon-shell-flake
     , lint-utils
     , nixpkgs
     , ...
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
+      systems = [
+        "aarch64-darwin"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ];
       perSystem = { config, system, ... }:
         let
           pkgs = nixpkgs.legacyPackages.${system};
@@ -39,11 +36,8 @@
         in
         with pkgs.lib;
         let
-          horizon-shell = get-flake horizon-shell-flake;
-
           haskellLib = pkgs.haskell.lib;
 
-
           overrides = composeManyExtensions [
             (import ./overlay.nix { inherit pkgs; })
             (import ./configuration/common.nix { inherit pkgs haskellLib; })
@@ -54,16 +48,6 @@
 
           packages = filterAttrs (_: isDerivation) legacyPackages;
 
-          devShell = pkgs.mkShell {
-            buildInputs = [
-              horizon-shell.packages.${system}.default
-            ];
-            shellHook = ''
-              horizon-shell
-              exit
-            '';
-          };
-
         in
         {
 
@@ -72,8 +56,6 @@
             nixpkgs-fmt = nixpkgs-fmt { src = self; find = "flake.nix"; };
           };
 
-          devShells.default = devShell;
-
           inherit legacyPackages;
 
           inherit packages;
diff --git a/horizon.dhall b/horizon.dhall
index d09864b2f0b5e612f1ef2a75550f41be77fdcdee..7ed19eb71d1cfa21b4a4a3294a87732161419d84 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -2,28 +2,28 @@ let H =
       https://gitlab.horizon-haskell.net/dhall/horizon-spec/-/raw/0.10.0/horizon-spec/package.dhall
 
 let packages =
-      { BNFC = H.callHackage "BNFC" "2.9.4.1"
+      { BNFC = H.callHackage "BNFC" "2.9.5"
       , Boolean = H.callHackage "Boolean" "0.2.4"
-      , Chart = H.callHackage "Chart" "1.9.4"
-      , Chart-diagrams = H.callHackage "Chart-diagrams" "1.9.4"
+      , Chart = H.callHackage "Chart" "1.9.5"
+      , Chart-diagrams = H.callHackage "Chart-diagrams" "1.9.5.1"
       , Decimal = H.callHackage "Decimal" "0.5.2"
       , HTF = H.callHackage "HTF" "0.15.0.1"
       , HTTP = H.callHackage "HTTP" "4000.4.1"
       , HUnit = H.callHackage "HUnit" "1.6.2.0"
-      , HaskellNet = H.callHackage "HaskellNet" "0.6.0.2"
+      , HaskellNet = H.callHackage "HaskellNet" "0.6.1.2"
       , Hclip = H.callHackage "Hclip" "3.0.0.4"
-      , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.5"
-      , HsYAML = H.callHackage "HsYAML" "0.2.1.1"
+      , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.6"
+      , HsYAML = H.callHackage "HsYAML" "0.2.1.3"
       , JuicyPixels = H.callHackage "JuicyPixels" "3.3.8"
-      , ListLike = H.callHackage "ListLike" "4.7.8"
-      , MemoTrie = H.callHackage "MemoTrie" "0.6.10"
+      , ListLike = H.callHackage "ListLike" "4.7.8.2"
+      , MemoTrie = H.callHackage "MemoTrie" "0.6.11"
       , MonadPrompt = H.callHackage "MonadPrompt" "1.0.0.5"
       , NumInstances = H.callHackage "NumInstances" "1.4"
       , Only = H.callHackage "Only" "0.1"
       , OpenGLRaw = H.callHackage "OpenGLRaw" "3.3.4.1"
-      , PSQueue = H.callHackage "PSQueue" "1.1.1"
-      , PyF = H.callHackage "PyF" "0.11.1.1"
-      , QuickCheck = H.callHackage "QuickCheck" "2.14.2"
+      , PSQueue = H.callHackage "PSQueue" "1.2.0"
+      , PyF = H.callHackage "PyF" "0.11.2.1"
+      , QuickCheck = H.callHackage "QuickCheck" "2.14.3"
       , RSA = H.callHackage "RSA" "2.4.1"
       , SVGFonts = H.callHackage "SVGFonts" "1.8.0.1"
       , Stream = H.callHackage "Stream" "0.4.7.2"
@@ -32,24 +32,26 @@ let packages =
       , X11 = H.callHackage "X11" "1.10.3"
       , X11-xft = H.callHackage "X11-xft" "0.3.4"
       , abstract-deque-tests = H.callHackage "abstract-deque-tests" "0.3"
-      , active = H.callHackage "active" "0.2.0.17"
+      , active = H.callHackage "active" "0.2.0.18"
+      , aeson = H.callHackage "aeson" "2.1.2.1"
       , aeson-qq = H.callHackage "aeson-qq" "0.8.4"
       , aeson-yaml = H.callHackage "aeson-yaml" "1.1.0.1"
-      , alex = H.callHackage "alex" "3.2.7.1"
-      , algebraic-graphs = H.callHackage "algebraic-graphs" "0.6.1"
+      , alex = H.callHackage "alex" "3.4.0.1"
+      , algebraic-graphs = H.callHackage "algebraic-graphs" "0.7"
       , alsa-core = H.callHackage "alsa-core" "0.5.0.1"
       , alsa-mixer = H.callHackage "alsa-mixer" "0.3.0"
       , ap-normalize = H.callHackage "ap-normalize" "0.1.0.1"
       , apecs = H.callHackage "apecs" "0.9.5"
       , apply-refact = H.callHackage "apply-refact" "0.13.0.0"
       , async-timer = H.callHackage "async-timer" "0.2.0.0"
+      , attoparsec-aeson = H.callHackage "attoparsec-aeson" "2.1.0.0"
       , attoparsec-binary = H.callHackage "attoparsec-binary" "0.2"
-      , attoparsec-iso8601 = H.callHackage "attoparsec-iso8601" "1.1.0.0"
+      , attoparsec-iso8601 = H.callHackage "attoparsec-iso8601" "1.1.0.1"
       , authenticate-oauth = H.callHackage "authenticate-oauth" "1.7"
       , autodocodec-servant-multipart =
           H.callHackage "autodocodec-servant-multipart" "0.0.0.0"
       , autoexporter = H.callHackage "autoexporter" "2.0.0.8"
-      , base-prelude = H.callHackage "base-prelude" "1.6.1"
+      , base-prelude = H.callHackage "base-prelude" "1.6.1.1"
       , base58-bytestring = H.callHackage "base58-bytestring" "0.1.0"
       , base64 = H.callHackage "base64" "0.4.2.4"
       , base64-bytestring = H.callHackage "base64-bytestring" "1.2.1.0"
@@ -74,23 +76,21 @@ let packages =
             "https://github.com/haskell-beam/beam"
             "96e35be86dfffe4aa0b8190f7b8656e30cb36301"
             (Some "beam-sqlite/")
-      , bech32 = H.callHackage "bech32" "1.1.2"
+      , bech32 = H.callHackage "bech32" "1.1.4"
       , bech32-th = H.callHackage "bech32-th" "1.1.1"
       , bin = H.callHackage "bin" "0.1.3"
       , binary-orphans = H.callHackage "binary-orphans" "1.0.4.1"
-      , binary-parser = H.callHackage "binary-parser" "0.5.7.3"
-      , blaze-svg = H.callHackage "blaze-svg" "0.3.6.1"
+      , binary-parser = H.callHackage "binary-parser" "0.5.7.4"
+      , blaze-svg = H.callHackage "blaze-svg" "0.3.7"
       , blaze-textual = H.callHackage "blaze-textual" "0.2.3.1"
-      , breakpoint = H.callHackage "breakpoint" "0.1.2.1"
-      , brick = H.callHackage "brick" "1.9"
-      , bytes = H.callHackage "bytes" "0.17.2"
+      , breakpoint = H.callHackage "breakpoint" "0.1.2.2"
+      , brick = H.callHackage "brick" "2.0"
+      , bytes = H.callHackage "bytes" "0.17.3"
       , bytestring-strict-builder =
-          H.callHackage "bytestring-strict-builder" "0.4.5.6"
+          H.callHackage "bytestring-strict-builder" "0.4.5.7"
       , bytestring-tree-builder =
-          H.callHackage "bytestring-tree-builder" "0.2.7.10"
+          H.callHackage "bytestring-tree-builder" "0.2.7.11"
       , c2hs = H.callHackage "c2hs" "0.28.8"
-      , cabal-install = H.callHackage "cabal-install" "3.8.1.0"
-      , cabal-install-solver = H.callHackage "cabal-install-solver" "3.8.1.0"
       , cache = H.callHackage "cache" "0.1.3.0"
       , canonical-json = H.callHackage "canonical-json" "0.6.0.1"
       , casing = H.callHackage "casing" "0.1.4.1"
@@ -98,16 +98,16 @@ let packages =
       , cassava-megaparsec = H.callHackage "cassava-megaparsec" "2.0.4"
       , cheapskate = H.callHackage "cheapskate" "0.1.1.2"
       , checkers = H.callHackage "checkers" "0.6.0"
-      , chell = H.callHackage "chell" "0.5.0.1"
-      , chell-quickcheck = H.callHackage "chell-quickcheck" "0.2.5.3"
+      , chell = H.callHackage "chell" "0.5.0.2"
+      , chell-quickcheck = H.callHackage "chell-quickcheck" "0.2.5.4"
       , circle-packing = H.callHackage "circle-packing" "0.1.0.6"
       , citeproc = H.callHackage "citeproc" "0.8.1"
-      , cmark-gfm = H.callHackage "cmark-gfm" "0.2.5"
-      , co-log-core = H.callHackage "co-log-core" "0.3.2.0"
-      , co-log-polysemy = H.callHackage "co-log-polysemy" "0.0.1.3"
+      , cmark-gfm = H.callHackage "cmark-gfm" "0.2.6"
+      , co-log-core = H.callHackage "co-log-core" "0.3.2.1"
+      , co-log-polysemy = H.callHackage "co-log-polysemy" "0.0.1.4"
       , colourista = H.callHackage "colourista" "0.1.0.2"
-      , commonmark = H.callHackage "commonmark" "0.2.2"
-      , commonmark-extensions = H.callHackage "commonmark-extensions" "0.2.3.4"
+      , commonmark = H.callHackage "commonmark" "0.2.4"
+      , commonmark-extensions = H.callHackage "commonmark-extensions" "0.2.4"
       , commonmark-pandoc = H.callHackage "commonmark-pandoc" "0.2.1.3"
       , commutative-semigroups =
           H.callHackage "commutative-semigroups" "0.1.0.1"
@@ -128,16 +128,16 @@ let packages =
       , conduit-combinators = H.callHackage "conduit-combinators" "1.3.0"
       , conduit-parse = H.callHackage "conduit-parse" "0.2.1.1"
       , constraints-extras = H.callHackage "constraints-extras" "0.4.0.0"
+      , contravariant-extras = H.callHackage "contravariant-extras" "0.3.5.4"
       , control-monad-free = H.callHackage "control-monad-free" "0.6.2"
-      , contravariant-extras = H.callHackage "contravariant-extras" "0.3.5.3"
       , cpphs = H.callHackage "cpphs" "1.20.9.1"
-      , criterion = H.callHackage "criterion" "1.6.0.0"
+      , criterion = H.callHackage "criterion" "1.6.3.0"
       , crypto-pubkey-types = H.callHackage "crypto-pubkey-types" "0.4.3"
       , cryptohash-md5 = H.callHackage "cryptohash-md5" "0.11.101.0"
       , cryptohash-sha1 = H.callHackage "cryptohash-sha1" "0.11.101.0"
       , cryptonite-conduit = H.callHackage "cryptonite-conduit" "0.2.2"
       , css-text = H.callHackage "css-text" "0.1.3.0"
-      , cubicbezier = H.callHackage "cubicbezier" "0.6.0.6"
+      , cubicbezier = H.callHackage "cubicbezier" "0.6.0.7"
       , cursor = H.callHackage "cursor" "0.3.2.0"
       , cursor-brick = H.callHackage "cursor-brick" "0.1.0.1"
       , cursor-dirforest =
@@ -159,31 +159,29 @@ let packages =
       , cursor-gen = H.callHackage "cursor-gen" "0.4.0.0"
       , data-binary-ieee754 = H.callHackage "data-binary-ieee754" "0.4.4"
       , data-bword = H.callHackage "data-bword" "0.1.0.2"
-      , data-dword = H.callHackage "data-dword" "0.3.2.1"
       , data-checked = H.callHackage "data-checked" "0.3"
+      , data-dword = H.callHackage "data-dword" "0.3.2.1"
       , data-endian = H.callHackage "data-endian" "0.1.1"
       , data-ordlist = H.callHackage "data-ordlist" "0.4.7.0"
       , data-serializer = H.callHackage "data-serializer" "0.3.5"
       , data-sketches = H.callHackage "data-sketches" "0.3.1.0"
       , data-sketches-core = H.callHackage "data-sketches-core" "0.1.0.0"
       , data-textual = H.callHackage "data-textual" "0.3.0.3"
-      , dbus = H.callHackage "dbus" "1.2.28"
+      , dbus = H.callHackage "dbus" "1.3.1"
       , deepseq-generics = H.callHackage "deepseq-generics" "0.2.0.0"
-      , deferred-folds = H.callHackage "deferred-folds" "0.9.18.3"
+      , deferred-folds = H.callHackage "deferred-folds" "0.9.18.5"
       , dense-linear-algebra = H.callHackage "dense-linear-algebra" "0.1.0.0"
       , dependent-map = H.callHackage "dependent-map" "0.4.0.0"
       , dependent-sum = H.callHackage "dependent-sum" "0.7.2.0"
       , dependent-sum-template =
-          H.callHackage "dependent-sum-template" "0.1.1.1"
+          H.callHackage "dependent-sum-template" "0.2.0.0"
       , deque = H.callHackage "deque" "0.4.4"
       , deriving-aeson = H.callHackage "deriving-aeson" "0.2.9"
-      , deriving-compat = H.callHackage "deriving-compat" "0.6.3"
-      , dhall-docs = H.callHackage "dhall-docs" "1.0.10"
-      , dhall-json = H.callHackage "dhall-json" "1.7.11"
-      , dhall-nixpkgs = H.callHackage "dhall-nixpkgs" "1.0.9"
-      , diagrams-contrib = H.callHackage "diagrams-contrib" "1.4.5"
+      , deriving-compat = H.callHackage "deriving-compat" "0.6.5"
+      , dhall-docs = H.callHackage "dhall-docs" "1.0.11"
+      , diagrams-contrib = H.callHackage "diagrams-contrib" "1.4.5.1"
       , diagrams-core = H.callHackage "diagrams-core" "1.5.1"
-      , diagrams-lib = H.callHackage "diagrams-lib" "1.4.5.3"
+      , diagrams-lib = H.callHackage "diagrams-lib" "1.4.6"
       , diagrams-postscript = H.callHackage "diagrams-postscript" "1.5.1.1"
       , diagrams-solve = H.callHackage "diagrams-solve" "0.1.3"
       , diagrams-svg = H.callHackage "diagrams-svg" "1.4.3.1"
@@ -196,10 +194,10 @@ let packages =
             "https://github.com/NorfairKing/dirforest"
             "69e8ae036b047fae105c1fe990e175a7572a3eba"
             (Some "dirforest/")
-      , dns = H.callHackage "dns" "4.1.0"
+      , dns = H.callHackage "dns" "4.2.0"
       , doclayout = H.callHackage "doclayout" "0.4.0.1"
       , doctemplates = H.callHackage "doctemplates" "0.11"
-      , doctest = H.callHackage "doctest" "0.21.1"
+      , doctest = H.callHackage "doctest" "0.22.2"
       , doctest-discover = H.callHackage "doctest-discover" "0.2.0.0"
       , dom-lt = H.callHackage "dom-lt" "0.2.3"
       , double-conversion = H.callHackage "double-conversion" "2.0.4.2"
@@ -211,13 +209,13 @@ let packages =
             "faf8fe90aa1cd2492ea1e64c55f5c59fc0322210"
             (None H.Subdir)
       , edit-distance = H.callHackage "edit-distance" "0.2.2.1"
-      , effectful = H.callHackage "effectful" "2.2.2.0"
+      , effectful = H.callHackage "effectful" "2.3.0.0"
       , effectful-cache =
           H.callGit
             "https://github.com/haskell-effectful/cache-effectful"
             "0a5581da7c21a05a9ab1762a6da6997090fe311d"
             (None H.Subdir)
-      , effectful-core = H.callHackage "effectful-core" "2.2.2.2"
+      , effectful-core = H.callHackage "effectful-core" "2.3.0.0"
       , effectful-th = H.callHackage "effectful-th" "1.0.0.1"
       , ekg = H.callHackage "ekg" "0.4.0.15"
       , ekg-core = H.callHackage "ekg-core" "0.1.1.7"
@@ -228,9 +226,8 @@ let packages =
             (None H.Subdir)
       , ekg-statsd = H.callHackage "ekg-statsd" "0.2.5.0"
       , ekg-wai = H.callHackage "ekg-wai" "0.1.1.0"
-      , ema = H.callHackage "ema" "0.10.0.0"
-      , email-validate = H.callHackage "email-validate" "2.3.2.18"
-      , emojis = H.callHackage "emojis" "0.1.2"
+      , email-validate = H.callHackage "email-validate" "2.3.2.19"
+      , emojis = H.callHackage "emojis" "0.1.3"
       , enclosed-exceptions = H.callHackage "enclosed-exceptions" "1.0.3"
       , enummapset = H.callHackage "enummapset" "0.7.1.0"
       , errors = H.callHackage "errors" "2.3.0"
@@ -241,9 +238,8 @@ let packages =
       , extensible-effects = H.callHackage "extensible-effects" "5.0.0.1"
       , fast-math = H.callHackage "fast-math" "1.0.2"
       , fcf-containers = H.callHackage "fcf-containers" "0.8.2"
-      , feedback = H.callHackage "feedback" "0.1.0.1"
       , file-embed = H.callHackage "file-embed" "0.0.15.0"
-      , filelock = H.callHackage "filelock" "0.1.1.6"
+      , filelock = H.callHackage "filelock" "0.1.1.7"
       , filemanip = H.callHackage "filemanip" "0.3.6.3"
       , filepattern = H.callHackage "filepattern" "0.1.3"
       , filtrable = H.callHackage "filtrable" "0.1.6.0"
@@ -252,7 +248,7 @@ let packages =
       , fixed = H.callHackage "fixed" "0.3"
       , floatshow = H.callHackage "floatshow" "0.2.4"
       , fmt = H.callHackage "fmt" "0.6.3.0"
-      , focus = H.callHackage "focus" "1.0.3.1"
+      , focus = H.callHackage "focus" "1.0.3.2"
       , force-layout = H.callHackage "force-layout" "0.4.0.6"
       , foreign-store = H.callHackage "foreign-store" "0.2"
       , formatting = H.callHackage "formatting" "7.2.0"
@@ -261,7 +257,7 @@ let packages =
             "https://gitlab.rescue.horizon-haskell.net/hackage/foundation"
             "d3136f4bb8b69e273535352620e53f2196941b35"
             (Some "foundation/")
-      , fourmolu = H.callHackage "fourmolu" "0.10.1.0"
+      , fourmolu = H.callHackage "fourmolu" "0.14.1.0"
       , freer-simple = H.callHackage "freer-simple" "1.2.1.2"
       , friendly-time = H.callHackage "friendly-time" "0.4.1"
       , fsnotify = H.callHackage "fsnotify" "0.4.1.0"
@@ -277,7 +273,7 @@ let packages =
       , generic-monoid = H.callHackage "generic-monoid" "0.1.0.1"
       , generic-optics = H.callHackage "generic-optics" "2.2.1.0"
       , generic-optics-lite = H.callHackage "generic-optics-lite" "0.1"
-      , generics-sop = H.callHackage "generics-sop" "0.5.1.3"
+      , generics-sop = H.callHackage "generics-sop" "0.5.1.4"
       , genvalidity-aeson = H.callHackage "genvalidity-aeson" "1.0.0.1"
       , genvalidity-bytestring =
           H.callHackage "genvalidity-bytestring" "1.0.0.1"
@@ -297,14 +293,14 @@ let packages =
           H.callHackage "genvalidity-hspec-optics" "1.0.0.0"
       , genvalidity-path = H.callHackage "genvalidity-path" "1.0.0.1"
       , genvalidity-persistent =
-          H.callHackage "genvalidity-persistent" "1.0.0.1"
+          H.callHackage "genvalidity-persistent" "1.0.0.2"
       , genvalidity-scientific =
           H.callHackage "genvalidity-scientific" "1.0.0.0"
       , genvalidity-sydtest = H.callHackage "genvalidity-sydtest" "1.0.0.0"
       , genvalidity-sydtest-aeson =
           H.callHackage "genvalidity-sydtest-aeson" "1.0.0.0"
       , genvalidity-sydtest-hashable =
-          H.callHackage "genvalidity-sydtest-hashable" "1.0.0.0"
+          H.callHackage "genvalidity-sydtest-hashable" "1.0.0.1"
       , genvalidity-sydtest-lens =
           H.callHackage "genvalidity-sydtest-lens" "1.0.0.0"
       , genvalidity-sydtest-persistent =
@@ -312,23 +308,23 @@ let packages =
       , genvalidity-text = H.callHackage "genvalidity-text" "1.0.0.1"
       , genvalidity-time = H.callHackage "genvalidity-time" "1.0.0.1"
       , genvalidity-unordered-containers =
-          H.callHackage "genvalidity-unordered-containers" "1.0.0.0"
+          H.callHackage "genvalidity-unordered-containers" "1.0.0.1"
       , genvalidity-uuid = H.callHackage "genvalidity-uuid" "1.0.0.1"
       , genvalidity-vector = H.callHackage "genvalidity-vector" "1.0.0.0"
       , ghc-check = H.callHackage "ghc-check" "0.5.0.8"
-      , ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.1.1"
-      , ghc-lib-parser = H.callHackage "ghc-lib-parser" "9.4.4.20221225"
-      , ghc-lib-parser-ex = H.callHackage "ghc-lib-parser-ex" "9.4.0.0"
-      , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.4"
+      , ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.1.3"
+      , ghc-lib-parser = H.callHackage "ghc-lib-parser" "9.6.3.20231014"
+      , ghc-lib-parser-ex = H.callHackage "ghc-lib-parser-ex" "9.6.0.2"
+      , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.5"
       , ghc-trace-events = H.callHackage "ghc-trace-events" "0.1.2.7"
-      , ghc-typelits-knownnat = H.callHackage "ghc-typelits-knownnat" "0.7.8"
+      , ghc-typelits-knownnat = H.callHackage "ghc-typelits-knownnat" "0.7.9"
       , ghc-typelits-natnormalise =
-          H.callHackage "ghc-typelits-natnormalise" "0.7.8"
-      , ghcid = H.callHackage "ghcid" "0.8.8"
-      , ghcide = H.callHackage "ghcide" "2.0.0.1"
-      , ghcide-bench = H.callHackage "ghcide-bench" "2.0.0.1"
+          H.callHackage "ghc-typelits-natnormalise" "0.7.9"
+      , ghcid = H.callHackage "ghcid" "0.8.9"
+      , ghcide = H.callHackage "ghcide" "2.4.0.0"
+      , ghcide-bench = H.callHackage "ghcide-bench" "2.4.0.0"
       , ghcide-test-utils = H.callHackage "ghcide-test-utils" "1.9.0.0"
-      , githash = H.callHackage "githash" "0.1.6.3"
+      , githash = H.callHackage "githash" "0.1.7.0"
       , gitrev = H.callHackage "gitrev" "1.3.1"
       , gridtables = H.callHackage "gridtables" "0.1.0.0"
       , groups = H.callHackage "groups" "0.5.3"
@@ -338,25 +334,27 @@ let packages =
       , hashing = H.callHackage "hashing" "0.1.1.0"
       , hashtables = H.callHackage "hashtables" "1.3.1"
       , haskell-language-server =
-          (H.callHackage "haskell-language-server" "2.0.0.1")
+          (H.callHackage "haskell-language-server" "2.4.0.0")
         with flags =
           [ H.CabalFlag.Disable "dynamic"
           , H.CabalFlag.Disable "ormolu"
+          , H.CabalFlag.Disable "fourmolu"
+          , H.CabalFlag.Disable "refine-imports"
           , H.CabalFlag.Disable "rename"
           , H.CabalFlag.Disable "stylishHaskell"
           , H.CabalFlag.Disable "eval"
           , H.CabalFlag.Disable "floskell"
           ]
       , haskell-src = H.callHackage "haskell-src" "1.0.4"
-      , hasql = H.callHackage "hasql" "1.6.3"
+      , hasql = H.callHackage "hasql" "1.6.3.3"
       , hasql-explain-tests = H.callHackage "hasql-explain-tests" "0.1.0.0"
       , hasql-migration = H.callHackage "hasql-migration" "0.3.0"
       , hasql-th = H.callHackage "hasql-th" "0.4.0.18"
       , hasql-transaction = H.callHackage "hasql-transaction" "1.0.1.2"
-      , hdaemonize = H.callHackage "hdaemonize" "0.5.6"
+      , hdaemonize = H.callHackage "hdaemonize" "0.5.7"
+      , headed-megaparsec = H.callHackage "headed-megaparsec" "0.2.1.2"
       , heaps = H.callHackage "heaps" "0.4"
-      , headed-megaparsec = H.callHackage "headed-megaparsec" "0.2.1.1"
-      , hedgehog-extras = H.callHackage "hedgehog-extras" "0.4.5.1"
+      , hedgehog-extras = H.callHackage "hedgehog-extras" "0.4.7.1"
       , hedgehog-fn = H.callHackage "hedgehog-fn" "1.0"
       , hedgehog-golden =
           H.callGit
@@ -365,51 +363,52 @@ let packages =
             (None H.Subdir)
       , hedgehog-quickcheck = H.callHackage "hedgehog-quickcheck" "0.1.1"
       , heredoc = H.callHackage "heredoc" "0.2.0.0"
-      , hex-text = H.callHackage "hex-text" "0.1.0.8"
+      , hex-text = H.callHackage "hex-text" "0.1.0.9"
       , hie-bios = H.callHackage "hie-bios" "0.12.0"
-      , hie-compat = H.callHackage "hie-compat" "0.3.1.0"
-      , hiedb = H.callHackage "hiedb" "0.4.3.0"
+      , hie-compat = H.callHackage "hie-compat" "0.3.1.1"
+      , hiedb =
+          H.callGit
+            "https://github.com/wz1000/HieDB"
+            "62ef191df2c1ce3324c2dfc2f2a574863642435d"
+            (None H.Subdir)
       , hinotify = H.callHackage "hinotify" "0.4.1"
       , hint =
           H.callGit
             "https://github.com/haskell-hint/hint"
             "7803c34c8ae1d83c0f7c13fe6b30fcb3abd0ac51"
             (None H.Subdir)
-      , hlint = H.callHackage "hlint" "3.5"
+      , hlint = H.callHackage "hlint" "3.6.1"
       , hls-alternate-number-format-plugin =
-          H.callHackage "hls-alternate-number-format-plugin" "2.0.0.1"
-      , hls-cabal-fmt-plugin = H.callHackage "hls-cabal-fmt-plugin" "2.0.0.1"
-      , hls-cabal-plugin = H.callHackage "hls-cabal-plugin" "2.0.0.1"
+          H.callHackage "hls-alternate-number-format-plugin" "2.4.0.0"
+      , hls-cabal-fmt-plugin = H.callHackage "hls-cabal-fmt-plugin" "2.4.0.0"
+      , hls-cabal-plugin = H.callHackage "hls-cabal-plugin" "2.4.0.0"
       , hls-call-hierarchy-plugin =
-          H.callHackage "hls-call-hierarchy-plugin" "2.0.0.1"
+          H.callHackage "hls-call-hierarchy-plugin" "2.4.0.0"
       , hls-change-type-signature-plugin =
-          H.callHackage "hls-change-type-signature-plugin" "2.0.0.1"
-      , hls-class-plugin = H.callHackage "hls-class-plugin" "2.0.0.1"
-      , hls-code-range-plugin = H.callHackage "hls-code-range-plugin" "2.0.0.1"
+          H.callHackage "hls-change-type-signature-plugin" "2.4.0.0"
+      , hls-class-plugin = H.callHackage "hls-class-plugin" "2.4.0.0"
+      , hls-code-range-plugin = H.callHackage "hls-code-range-plugin" "2.4.0.0"
       , hls-explicit-fixity-plugin =
-          H.callHackage "hls-explicit-fixity-plugin" "2.0.0.1"
+          H.callHackage "hls-explicit-fixity-plugin" "2.4.0.0"
       , hls-explicit-imports-plugin =
-          H.callHackage "hls-explicit-imports-plugin" "2.0.0.1"
+          H.callHackage "hls-explicit-imports-plugin" "2.4.0.0"
       , hls-explicit-record-fields-plugin =
-          H.callHackage "hls-explicit-record-fields-plugin" "2.0.0.1"
-      , hls-fourmolu-plugin = H.callHackage "hls-fourmolu-plugin" "2.0.0.1"
-      , hls-gadt-plugin = H.callHackage "hls-gadt-plugin" "2.0.0.1"
-      , hls-graph = H.callHackage "hls-graph" "2.0.0.1"
-      , hls-hlint-plugin = H.callHackage "hls-hlint-plugin" "2.0.0.1"
+          H.callHackage "hls-explicit-record-fields-plugin" "2.4.0.0"
+      , hls-gadt-plugin = H.callHackage "hls-gadt-plugin" "2.4.0.0"
+      , hls-graph = H.callHackage "hls-graph" "2.4.0.0"
+      , hls-hlint-plugin = H.callHackage "hls-hlint-plugin" "2.4.0.0"
       , hls-module-name-plugin =
-          H.callHackage "hls-module-name-plugin" "2.0.0.1"
+          H.callHackage "hls-module-name-plugin" "2.4.0.0"
       , hls-overloaded-record-dot-plugin =
-          H.callHackage "hls-overloaded-record-dot-plugin" "2.0.0.1"
-      , hls-plugin-api = H.callHackage "hls-plugin-api" "2.0.0.1"
-      , hls-pragmas-plugin = H.callHackage "hls-pragmas-plugin" "2.0.0.1"
+          H.callHackage "hls-overloaded-record-dot-plugin" "2.4.0.0"
+      , hls-plugin-api = H.callHackage "hls-plugin-api" "2.4.0.0"
+      , hls-pragmas-plugin = H.callHackage "hls-pragmas-plugin" "2.4.0.0"
       , hls-qualify-imported-names-plugin =
-          H.callHackage "hls-qualify-imported-names-plugin" "2.0.0.1"
-      , hls-refactor-plugin = H.callHackage "hls-refactor-plugin" "2.0.0.1"
-      , hls-refine-imports-plugin =
-          H.callHackage "hls-refine-imports-plugin" "2.0.0.1"
-      , hls-retrie-plugin = H.callHackage "hls-retrie-plugin" "2.0.0.1"
-      , hls-splice-plugin = H.callHackage "hls-splice-plugin" "2.0.0.1"
-      , hls-test-utils = H.callHackage "hls-test-utils" "2.0.0.1"
+          H.callHackage "hls-qualify-imported-names-plugin" "2.4.0.0"
+      , hls-refactor-plugin = H.callHackage "hls-refactor-plugin" "2.4.0.0"
+      , hls-retrie-plugin = H.callHackage "hls-retrie-plugin" "2.4.0.0"
+      , hls-splice-plugin = H.callHackage "hls-splice-plugin" "2.4.0.0"
+      , hls-test-utils = H.callHackage "hls-test-utils" "2.4.0.0"
       , hnix =
           H.callGit
             "https://github.com/haskell-nix/hnix"
@@ -419,7 +418,6 @@ let packages =
       , hnix-store-remote = H.callHackage "hnix-store-remote" "0.6.0.0"
       , hosc = H.callHackage "hosc" "0.20"
       , hp2pretty = H.callHackage "hp2pretty" "0.10"
-      , hpack-dhall = H.callHackage "hpack-dhall" "0.5.7"
       , hslogger = H.callHackage "hslogger" "1.3.1.0"
       , hslua = H.callHackage "hslua" "2.3.0"
       , hslua-aeson = H.callHackage "hslua-aeson" "2.3.0.1"
@@ -440,19 +438,19 @@ let packages =
       , hspec-contrib = H.callHackage "hspec-contrib" "0.5.2"
       , hspec-expectations-lifted =
           H.callHackage "hspec-expectations-lifted" "0.10.0"
-      , hspec-golden = H.callHackage "hspec-golden" "0.2.0.1"
+      , hspec-golden = H.callHackage "hspec-golden" "0.2.1.0"
       , hspec-golden-aeson = H.callHackage "hspec-golden-aeson" "0.9.0.0"
-      , hspec-hedgehog = H.callHackage "hspec-hedgehog" "0.0.1.2"
-      , hspec-megaparsec = H.callHackage "hspec-megaparsec" "2.2.0"
+      , hspec-hedgehog = H.callHackage "hspec-hedgehog" "0.1.1.0"
+      , hspec-megaparsec = H.callHackage "hspec-megaparsec" "2.2.1"
       , hspec-wai = H.callHackage "hspec-wai" "0.11.1"
       , hsyslog = H.callHackage "hsyslog" "5.0.2"
       , html = H.callHackage "html" "1.0.1.2"
       , html-entities = H.callHackage "html-entities" "1.1.4.6"
       , html-entity-map = H.callHackage "html-entity-map" "0.1.0.0"
-      , http-api-data = H.callHackage "http-api-data" "0.5.1"
+      , http-api-data = H.callHackage "http-api-data" "0.6"
       , http-common = H.callHackage "http-common" "0.8.3.4"
-      , http-media = H.callHackage "http-media" "0.8.0.0"
-      , http-streams = H.callHackage "http-streams" "0.8.9.6"
+      , http-media = H.callHackage "http-media" "0.8.1.1"
+      , http-streams = H.callHackage "http-streams" "0.8.9.9"
       , hw-aeson = H.callHackage "hw-aeson" "0.1.8.0"
       , hw-fingertree = H.callHackage "hw-fingertree" "0.1.2.1"
       , hw-hedgehog = H.callHackage "hw-hedgehog" "0.1.1.1"
@@ -467,10 +465,10 @@ let packages =
       , incipit-base = H.callHackage "incipit-base" "0.5.1.0"
       , incipit-core = H.callHackage "incipit-core" "0.5.1.0"
       , indexed-list-literals = H.callHackage "indexed-list-literals" "0.2.1.3"
-      , indexed-profunctors = H.callHackage "indexed-profunctors" "0.1.1"
-      , inline-c = H.callHackage "inline-c" "0.9.1.7"
+      , indexed-profunctors = H.callHackage "indexed-profunctors" "0.1.1.1"
+      , inline-c = H.callHackage "inline-c" "0.9.1.10"
       , insert-ordered-containers =
-          H.callHackage "insert-ordered-containers" "0.2.5.2"
+          H.callHackage "insert-ordered-containers" "0.2.5.3"
       , int-cast = H.callHackage "int-cast" "0.2.0.0"
       , integer-logarithms = H.callHackage "integer-logarithms" "1.0.3.1"
       , integration = H.callHackage "integration" "0.2.1"
@@ -479,10 +477,10 @@ let packages =
       , io-streams-haproxy = H.callHackage "io-streams-haproxy" "1.0.1.0"
       , ipynb = H.callHackage "ipynb" "0.2"
       , iso8601-time = H.callHackage "iso8601-time" "0.1.5"
-      , isomorphism-class = H.callHackage "isomorphism-class" "0.1.0.9"
+      , isomorphism-class = H.callHackage "isomorphism-class" "0.1.0.11"
       , iwlib = H.callHackage "iwlib" "0.1.2"
       , jira-wiki-markup = H.callHackage "jira-wiki-markup" "1.5.1"
-      , jose = H.callHackage "jose" "0.10"
+      , jose = H.callHackage "jose" "0.11"
       , jose-jwt = H.callHackage "jose-jwt" "0.9.6"
       , js-chart = H.callHackage "js-chart" "2.9.4.1"
       , js-dgtable = H.callHackage "js-dgtable" "0.5.2"
@@ -514,13 +512,13 @@ let packages =
       , lens-family = H.callHackage "lens-family" "2.1.2"
       , lens-family-th = H.callHackage "lens-family-th" "0.5.2.1"
       , libsodium = H.callHackage "libsodium" "1.0.18.3"
-      , libsystemd-journal = H.callHackage "libsystemd-journal" "1.4.5"
+      , libsystemd-journal = H.callHackage "libsystemd-journal" "1.4.5.1"
       , lift-type = H.callHackage "lift-type" "0.1.1.1"
       , linear = H.callHackage "linear" "1.22"
-      , linear-base = H.callHackage "linear-base" "0.3.1"
+      , linear-base = H.callHackage "linear-base" "0.4.0"
       , linear-generics = H.callHackage "linear-generics" "0.2.2"
-      , list-t = H.callHackage "list-t" "1.0.5.6"
-      , list-transformer = H.callHackage "list-transformer" "1.0.9"
+      , list-t = H.callHackage "list-t" "1.0.5.7"
+      , list-transformer = H.callHackage "list-transformer" "1.1.0"
       , lockfree-queue = H.callHackage "lockfree-queue" "0.2.4"
       , log-base = H.callHackage "log-base" "0.12.0.1"
       , log-effectful =
@@ -529,11 +527,11 @@ let packages =
             "910c79e10d5ac3353f2a1551103a2b63229c3f57"
             (None H.Subdir)
       , loop = H.callHackage "loop" "0.3.0"
-      , lpeg = H.callHackage "lpeg" "1.0.4"
+      , lpeg = H.callHackage "lpeg" "1.1.0"
       , lrucache = H.callHackage "lrucache" "1.2.0.1"
-      , lsp = H.callHackage "lsp" "1.6.0.0"
-      , lsp-test = H.callHackage "lsp-test" "0.14.1.0"
-      , lsp-types = H.callHackage "lsp-types" "1.6.0.0"
+      , lsp = H.callHackage "lsp" "2.2.0.0"
+      , lsp-test = H.callHackage "lsp-test" "0.16.0.0"
+      , lsp-types = H.callHackage "lsp-types" "2.0.2.0"
       , lua = H.callHackage "lua" "2.3.1"
       , lua-arbitrary = H.callHackage "lua-arbitrary" "1.0.1.1"
       , lucid = H.callHackage "lucid" "2.11.20230408"
@@ -543,50 +541,48 @@ let packages =
       , lukko = H.callHackage "lukko" "0.1.1.3"
       , lvar = H.callHackage "lvar" "0.1.0.0"
       , markdown = H.callHackage "markdown" "0.1.17.5"
-      , markdown-unlit = H.callHackage "markdown-unlit" "0.5.1"
+      , markdown-unlit = H.callHackage "markdown-unlit" "0.6.0"
       , markov-chain-usage-model =
           H.callHackage "markov-chain-usage-model" "0.0.0"
       , matrices = H.callHackage "matrices" "0.5.0"
       , matrix = H.callHackage "matrix" "0.3.6.1"
       , mersenne-random-pure64 =
           H.callHackage "mersenne-random-pure64" "0.2.2.0"
-      , mfsolve = H.callHackage "mfsolve" "0.3.2.1"
-      , microlens-aeson = H.callHackage "microlens-aeson" "2.5.0"
-      , microlens-ghc = H.callHackage "microlens-ghc" "0.4.14.1"
-      , microlens-platform = H.callHackage "microlens-platform" "0.4.3.3"
+      , mfsolve = H.callHackage "mfsolve" "0.3.2.2"
+      , microlens-aeson = H.callHackage "microlens-aeson" "2.5.1"
+      , microlens-ghc = H.callHackage "microlens-ghc" "0.4.14.2"
+      , microlens-platform = H.callHackage "microlens-platform" "0.4.3.4"
       , microspec = H.callHackage "microspec" "0.2.1.3"
       , microstache = H.callHackage "microstache" "1.0.2.3"
       , mime-mail = H.callHackage "mime-mail" "0.5.1"
-      , minio-hs = H.callHackage "minio-hs" "1.6.0"
       , mmark = H.callHackage "mmark" "0.0.7.6"
       , mod = H.callHackage "mod" "0.2.0.1"
-      , modern-uri = H.callHackage "modern-uri" "0.3.6.0"
-      , monad-logger = H.callHackage "monad-logger" "0.3.39"
-      , monad-logger-extras = H.callHackage "monad-logger-extras" "0.1.1.1"
+      , modern-uri = H.callHackage "modern-uri" "0.3.6.1"
+      , monad-logger = H.callHackage "monad-logger" "0.3.40"
       , monad-loops = H.callHackage "monad-loops" "0.4.3"
       , monad-primitive = H.callHackage "monad-primitive" "0.1"
       , monad-time = H.callHackage "monad-time" "0.4.0.0"
       , monad-time-effectful = H.callHackage "monad-time-effectful" "1.0.0.0"
       , monadlist = H.callHackage "monadlist" "0.0.2"
-      , monads-tf = H.callHackage "monads-tf" "0.1.0.3"
+      , monads-tf = H.callHackage "monads-tf" "0.3.0.1"
       , monoid-extras = H.callHackage "monoid-extras" "0.6.2"
-      , monoid-subclasses = H.callHackage "monoid-subclasses" "1.2.3"
+      , monoid-subclasses = H.callHackage "monoid-subclasses" "1.2.4.1"
       , mtl-compat = H.callHackage "mtl-compat" "0.2.2"
       , mtl-prelude = H.callHackage "mtl-prelude" "2.0.3.2"
       , multiset = H.callHackage "multiset" "0.3.4.3"
       , mwc-random-monad = H.callHackage "mwc-random-monad" "0.7.3.1"
-      , natural-arithmetic = H.callHackage "natural-arithmetic" "0.1.3.0"
+      , natural-arithmetic = H.callHackage "natural-arithmetic" "0.1.4.0"
       , natural-transformation = H.callHackage "natural-transformation" "0.4"
-      , neat-interpolation = H.callHackage "neat-interpolation" "0.5.1.3"
-      , net-mqtt = H.callHackage "net-mqtt" "0.8.2.5"
-      , network-conduit-tls = H.callHackage "network-conduit-tls" "1.3.2"
+      , neat-interpolation = H.callHackage "neat-interpolation" "0.5.1.4"
+      , net-mqtt = H.callHackage "net-mqtt" "0.8.6.0"
+      , network-conduit-tls = H.callHackage "network-conduit-tls" "1.4.0"
       , network-info = H.callHackage "network-info" "0.2.1"
       , network-ip = H.callHackage "network-ip" "0.3.0.3"
       , newtype = H.callHackage "newtype" "0.2.2.0"
       , newtype-generics = H.callHackage "newtype-generics" "0.6.2"
       , nix-derivation = H.callHackage "nix-derivation" "1.1.2"
       , non-negative = H.callHackage "non-negative" "0.1.2"
-      , nonempty-vector = H.callHackage "nonempty-vector" "0.2.2.0"
+      , nonempty-vector = H.callHackage "nonempty-vector" "0.2.3"
       , numeric-extras = H.callHackage "numeric-extras" "0.1"
       , numeric-prelude = H.callHackage "numeric-prelude" "0.4.4"
       , numtype-dk = H.callHackage "numtype-dk" "0.5.0.3"
@@ -600,18 +596,18 @@ let packages =
       , openssl-streams = H.callHackage "openssl-streams" "1.2.3.0"
       , opentelemetry = H.callHackage "opentelemetry" "0.8.0"
       , operational = H.callHackage "operational" "0.2.4.2"
-      , optics = H.callHackage "optics" "0.4.2"
-      , optics-core = H.callHackage "optics-core" "0.4.1"
+      , optics = H.callHackage "optics" "0.4.2.1"
+      , optics-core = H.callHackage "optics-core" "0.4.1.1"
       , optics-extra = H.callHackage "optics-extra" "0.4.2.1"
       , optics-th = H.callHackage "optics-th" "0.4.1"
-      , options = H.callHackage "options" "1.2.1.1"
-      , optparse-generic = H.callHackage "optparse-generic" "1.5.0"
+      , options = H.callHackage "options" "1.2.1.2"
+      , optparse-generic = H.callHackage "optparse-generic" "1.5.1"
       , optparse-simple = H.callHackage "optparse-simple" "0.1.1.4"
       , ordered-containers = H.callHackage "ordered-containers" "0.2.3"
       , pager = H.callHackage "pager" "0.1.1.0"
-      , pandoc = H.callHackage "pandoc" "3.1.2"
+      , pandoc = H.callHackage "pandoc" "3.1.9"
       , pandoc-lua-marshal = H.callHackage "pandoc-lua-marshal" "0.2.2"
-      , pandoc-types = H.callHackage "pandoc-types" "1.23"
+      , pandoc-types = H.callHackage "pandoc-types" "1.23.1"
       , parsec-numbers = H.callHackage "parsec-numbers" "0.1.0"
       , parsec1 = H.callHackage "parsec1" "1.0.0.8"
       , parser-combinators = H.callHackage "parser-combinators" "1.3.0"
@@ -623,13 +619,13 @@ let packages =
       , pcg-random = H.callHackage "pcg-random" "0.1.4.0"
       , pcre-heavy = H.callHackage "pcre-heavy" "1.0.0.3"
       , pcre2 = H.callHackage "pcre2" "2.2.1"
-      , persistent = H.callHackage "persistent" "2.14.5.0"
-      , persistent-postgresql = H.callHackage "persistent-postgresql" "2.13.5.2"
-      , persistent-qq = H.callHackage "persistent-qq" "2.12.0.5"
-      , persistent-sqlite = H.callHackage "persistent-sqlite" "2.13.1.1"
+      , persistent = H.callHackage "persistent" "2.14.6.0"
+      , persistent-postgresql = H.callHackage "persistent-postgresql" "2.13.6.1"
+      , persistent-qq = H.callHackage "persistent-qq" "2.12.0.6"
+      , persistent-sqlite = H.callHackage "persistent-sqlite" "2.13.2.0"
       , persistent-template = H.callHackage "persistent-template" "2.12.0.0"
       , persistent-test = H.callHackage "persistent-test" "2.13.1.3"
-      , pg-entity = H.callHackage "pg-entity" "0.0.4.2"
+      , pg-entity = H.callHackage "pg-entity" "0.0.4.3"
       , pg-transact = H.callHackage "pg-transact" "0.3.2.0"
       , pg-transact-effectful =
           H.callGit
@@ -639,64 +635,66 @@ let packages =
       , pipes = H.callHackage "pipes" "4.3.16"
       , pipes-safe = H.callHackage "pipes-safe" "2.3.4"
       , pointed = H.callHackage "pointed" "5.0.4"
-      , poolboy = H.callHackage "poolboy" "0.2.2.0"
       , polyparse = H.callHackage "polyparse" "1.13"
-      , polysemy = H.callHackage "polysemy" "1.9.1.0"
+      , polysemy = H.callHackage "polysemy" "1.9.1.3"
       , polysemy-extra = H.callHackage "polysemy-extra" "0.2.1.0"
       , polysemy-kvstore = H.callHackage "polysemy-kvstore" "0.1.3.0"
       , polysemy-methodology = H.callHackage "polysemy-methodology" "0.2.2.0"
       , polysemy-path = H.callHackage "polysemy-path" "0.2.1.0"
-      , polysemy-plugin = H.callHackage "polysemy-plugin" "0.4.5.0"
+      , polysemy-plugin = H.callHackage "polysemy-plugin" "0.4.5.1"
       , polysemy-several = H.callHackage "polysemy-several" "0.1.1.0"
-      , polysemy-test = H.callHackage "polysemy-test" "0.7.0.0"
-      , polysemy-time = H.callHackage "polysemy-time" "0.6.0.0"
+      , polysemy-test = H.callHackage "polysemy-test" "0.9.0.0"
+      , polysemy-time = H.callHackage "polysemy-time" "0.6.0.2"
       , polysemy-vinyl = H.callHackage "polysemy-vinyl" "0.1.5.0"
-      , polysemy-zoo = H.callHackage "polysemy-zoo" "0.8.1.0"
+      , polysemy-zoo = H.callHackage "polysemy-zoo" "0.8.2.0"
+      , poolboy = H.callHackage "poolboy" "0.2.2.0"
       , port-utils = H.callHackage "port-utils" "0.2.1.0"
-      , postgresql-binary = H.callHackage "postgresql-binary" "0.13.1"
-      , postgres-options = H.callHackage "postgres-options" "0.2.0.0"
-      , postgresql-libpq = H.callHackage "postgresql-libpq" "0.9.5.0"
-      , postgresql-migration = H.callHackage "postgresql-migration" "0.2.1.6"
-      , postgresql-simple = H.callHackage "postgresql-simple" "0.6.5"
+      , postgres-options = H.callHackage "postgres-options" "0.2.1.0"
+      , postgresql-binary = H.callHackage "postgresql-binary" "0.13.1.1"
+      , postgresql-libpq = H.callHackage "postgresql-libpq" "0.10.0.0"
+      , postgresql-migration = H.callHackage "postgresql-migration" "0.2.1.7"
+      , postgresql-simple = H.callHackage "postgresql-simple" "0.7.0.0"
       , postgresql-simple-migration =
           H.callHackage "postgresql-simple-migration" "0.1.15.0"
       , postgresql-syntax = H.callHackage "postgresql-syntax" "0.4.1"
-      , pqueue = H.callHackage "pqueue" "1.4.3.0"
+      , pqueue = H.callHackage "pqueue" "1.5.0.0"
       , pretty-relative-time = H.callHackage "pretty-relative-time" "0.3.0.0"
       , primes = H.callHackage "primes" "0.2.1.0"
-      , primitive = H.callHackage "primitive" "0.8.0.0"
+      , primitive = H.callHackage "primitive" "0.9.0.0"
       , primitive-addr = H.callHackage "primitive-addr" "0.1.0.2"
-      , primitive-extras = H.callHackage "primitive-extras" "0.10.1.6"
+      , primitive-extras = H.callHackage "primitive-extras" "0.10.1.10"
       , primitive-offset = H.callHackage "primitive-offset" "0.2.0.0"
-      , primitive-unlifted = H.callHackage "primitive-unlifted" "0.1.3.1"
-      , prometheus-client = H.callHackage "prometheus-client" "1.1.0"
+      , primitive-unlifted = H.callHackage "primitive-unlifted" "2.1.0.0"
+      , prometheus-client = H.callHackage "prometheus-client" "1.1.1"
       , prometheus-metrics-ghc =
           H.callHackage "prometheus-metrics-ghc" "1.0.1.2"
       , prometheus-proc = H.callHackage "prometheus-proc" "0.1.5.0"
-      , proteaaudio-sdl = H.callHackage "proteaaudio-sdl" "0.9.3"
+      , proteaaudio-sdl = H.callHackage "proteaaudio-sdl" "0.10.1"
       , protolude = H.callHackage "protolude" "0.3.3"
       , quickcheck-arbitrary-adt =
           H.callHackage "quickcheck-arbitrary-adt" "0.3.1.0"
       , quickcheck-assertions = H.callHackage "quickcheck-assertions" "0.3.0"
       , quickcheck-text = H.callHackage "quickcheck-text" "0.1.2.1"
       , quiet = H.callHackage "quiet" "0.2"
+      , quote-quot = H.callHackage "quote-quot" "0.2.1.0"
       , random-bytestring = H.callHackage "random-bytestring" "0.1.4"
       , random-fu = H.callHackage "random-fu" "0.3.0.1"
       , raven-haskell = H.callHackage "raven-haskell" "0.1.4.1"
       , readable = H.callHackage "readable" "0.3.1"
-      , rebase = H.callHackage "rebase" "1.20"
-      , recursion-schemes = H.callHackage "recursion-schemes" "5.2.2.4"
+      , rebase = H.callHackage "rebase" "1.20.1.1"
+      , recursion-schemes = H.callHackage "recursion-schemes" "5.2.2.5"
       , ref-tf = H.callHackage "ref-tf" "0.5.0.1"
       , refact = H.callHackage "refact" "0.3.0.2"
       , refined = H.callHackage "refined" "0.8.1"
+      , regex = H.callHackage "regex" "1.1.0.2"
       , regex-applicative = H.callHackage "regex-applicative" "0.3.4"
       , regex-compat = H.callHackage "regex-compat" "0.95.2.1"
       , regex-pcre-builtin = H.callHackage "regex-pcre-builtin" "0.95.2.3.8.44"
-      , relude = H.callHackage "relude" "1.2.0.0"
-      , replace-megaparsec = H.callHackage "replace-megaparsec" "1.4.5.0"
-      , req = H.callHackage "req" "3.13.0"
-      , rerebase = H.callHackage "rerebase" "1.20"
-      , resolv = H.callHackage "resolv" "0.1.2.0"
+      , relude = H.callHackage "relude" "1.2.1.0"
+      , replace-megaparsec = H.callHackage "replace-megaparsec" "1.5.0.1"
+      , req = H.callHackage "req" "3.13.1"
+      , rerebase = H.callHackage "rerebase" "1.20.1.1"
+      , resolv = H.callHackage "resolv" "0.2.0.2"
       , resource-pool = H.callHackage "resource-pool" "0.4.0.0"
       , retrie = H.callHackage "retrie" "1.2.2"
       , retry = H.callHackage "retry" "0.9.3.1"
@@ -704,9 +702,9 @@ let packages =
       , row-types = H.callHackage "row-types" "1.0.1.2"
       , rvar = H.callHackage "rvar" "0.3.0.2"
       , saltine = H.callHackage "saltine" "0.2.1.0"
-      , sandwich = H.callHackage "sandwich" "0.1.3.2"
+      , sandwich = H.callHackage "sandwich" "0.1.5.2"
       , say = H.callHackage "say" "0.1.0.1"
-      , scotty = H.callHackage "scotty" "0.12.1"
+      , scotty = H.callHackage "scotty" "0.20.1"
       , sdl2 = H.callHackage "sdl2" "2.5.5.0"
       , sdl2-gfx = H.callHackage "sdl2-gfx" "0.3.0.0"
       , sdl2-image = H.callHackage "sdl2-image" "2.1.0.0"
@@ -714,67 +712,43 @@ let packages =
       , sdl2-ttf = H.callHackage "sdl2-ttf" "2.1.3"
       , selective = H.callHackage "selective" "0.7"
       , semver = H.callHackage "semver" "0.4.0.1"
-      , servant =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant/")
+      , servant = H.callHackage "servant" "0.20.1"
       , servant-auth = H.callHackage "servant-auth" "0.4.1.0"
-      , servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.0"
-      , servant-auth-server =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant-auth/servant-auth-server/")
+      , servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.1"
+      , servant-auth-server = H.callHackage "servant-auth-server" "0.4.8.0"
       , servant-blaze = H.callHackage "servant-blaze" "0.9.1"
-      , servant-client =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant-client/")
-      , servant-client-core =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant-client-core/")
-      , servant-docs = H.callHackage "servant-docs" "0.12"
+      , servant-client = H.callHackage "servant-client" "0.20"
+      , servant-client-core = H.callHackage "servant-client-core" "0.20"
+      , servant-docs = H.callHackage "servant-docs" "0.13"
       , servant-effectful =
           H.callGit
             "https://github.com/kleidukos/servant-effectful"
-            "65e3041c6cfbc315b20ad22ca18f61dda104eec8"
+            "21b5a1d7cb209f3b4594167bb0b5a8d632c8a8e1"
             (None H.Subdir)
-      , servant-foreign =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant-foreign/")
+      , servant-foreign = H.callHackage "servant-foreign" "0.16"
       , servant-lucid = H.callHackage "servant-lucid" "0.9.0.6"
       , servant-multipart = H.callHackage "servant-multipart" "0.12.1"
       , servant-multipart-api = H.callHackage "servant-multipart-api" "0.12.1"
       , servant-openapi3 = H.callHackage "servant-openapi3" "2.0.1.6"
-      , servant-server =
-          H.callGit
-            "https://github.com/haskell-servant/servant"
-            "7ae787371333556a7b84778631ed91d1d73e8370"
-            (Some "servant-server/")
+      , servant-server = H.callHackage "servant-server" "0.20"
       , servant-static-th = H.callHackage "servant-static-th" "1.0.0.0"
       , servant-websockets = H.callHackage "servant-websockets" "2.0.0"
       , setlocale = H.callHackage "setlocale" "1.0.0.10"
       , shake = H.callHackage "shake" "0.19.7"
       , shake-bench = H.callHackage "shake-bench" "0.2.0.0"
-      , shakespeare = H.callHackage "shakespeare" "2.1.0"
+      , shakespeare = H.callHackage "shakespeare" "2.1.0.1"
       , shelly = H.callHackage "shelly" "1.12.1"
-      , shh = H.callHackage "shh" "0.7.2.1"
+      , shh = H.callHackage "shh" "0.7.2.2"
       , should-not-typecheck = H.callHackage "should-not-typecheck" "2.1.0"
       , show-combinators = H.callHackage "show-combinators" "0.2.0.0"
       , singleton-bool = H.callHackage "singleton-bool" "0.1.7"
       , singletons = H.callHackage "singletons" "3.0.2"
-      , size-based = H.callHackage "size-based" "0.1.3.1"
-      , skylighting = H.callHackage "skylighting" "0.13.2.1"
-      , skylighting-core = H.callHackage "skylighting-core" "0.13.2.1"
+      , size-based = H.callHackage "size-based" "0.1.3.2"
+      , skylighting = H.callHackage "skylighting" "0.14"
+      , skylighting-core = H.callHackage "skylighting-core" "0.14"
       , skylighting-format-ansi = H.callHackage "skylighting-format-ansi" "0.1"
       , skylighting-format-blaze-html =
-          H.callHackage "skylighting-format-blaze-html" "0.1.1"
+          H.callHackage "skylighting-format-blaze-html" "0.1.1.1"
       , skylighting-format-context =
           H.callHackage "skylighting-format-context" "0.1.0.2"
       , skylighting-format-latex =
@@ -784,25 +758,25 @@ let packages =
       , snap-server = H.callHackage "snap-server" "1.1.2.1"
       , sop-core = H.callHackage "sop-core" "0.5.0.2"
       , sort = H.callHackage "sort" "1.0.0.0"
-      , sorted-list = H.callHackage "sorted-list" "0.2.1.0"
+      , sorted-list = H.callHackage "sorted-list" "0.2.2.0"
       , souffle-haskell = H.callHackage "souffle-haskell" "3.5.1"
       , sqlite-simple = H.callHackage "sqlite-simple" "0.4.18.2"
       , statestack = H.callHackage "statestack" "0.3.1.1"
-      , statistics = H.callHackage "statistics" "0.16.2.0"
+      , statistics = H.callHackage "statistics" "0.16.2.1"
       , statistics-linreg = H.callHackage "statistics-linreg" "0.3"
       , stm-chans = H.callHackage "stm-chans" "3.0.0.9"
-      , stm-containers = H.callHackage "stm-containers" "1.2.0.2"
-      , stm-hamt = H.callHackage "stm-hamt" "1.2.0.11"
+      , stm-containers = H.callHackage "stm-containers" "1.2.0.3"
+      , stm-hamt = H.callHackage "stm-hamt" "1.2.0.14"
       , streaming =
           H.callGit
             "https://github.com/haskell-streaming/streaming"
             "b6ec199103c078a07b3dcd197ab39020b2136426"
             (None H.Subdir)
       , streaming-binary = H.callHackage "streaming-binary" "0.3.0.1"
-      , streaming-bytestring = H.callHackage "streaming-bytestring" "0.3.0"
+      , streaming-bytestring = H.callHackage "streaming-bytestring" "0.3.1"
       , streamly = H.callHackage "streamly" "0.9.0"
       , streamly-core = H.callHackage "streamly-core" "0.1.0"
-      , strict-list = H.callHackage "strict-list" "0.1.7.1"
+      , strict-list = H.callHackage "strict-list" "0.1.7.2"
       , string-conv = H.callHackage "string-conv" "0.2.0"
       , string-conversions = H.callHackage "string-conversions" "0.4.0.1"
       , string-interpolate = H.callHackage "string-interpolate" "0.3.2.1"
@@ -816,50 +790,59 @@ let packages =
       , tagsoup = H.callHackage "tagsoup" "0.14.8"
       , tasty-discover = H.callHackage "tasty-discover" "5.0.0"
       , tasty-hslua = H.callHackage "tasty-hslua" "1.1.0"
-      , tasty-hspec = H.callHackage "tasty-hspec" "1.2.0.3"
+      , tasty-hspec = H.callHackage "tasty-hspec" "1.2.0.4"
       , tasty-lua = H.callHackage "tasty-lua" "1.1.0"
-      , tasty-rerun = H.callHackage "tasty-rerun" "1.1.18"
+      , tasty-rerun = H.callHackage "tasty-rerun" "1.1.19"
       , tasty-wai = H.callHackage "tasty-wai" "0.1.2.0"
       , tdigest = H.callHackage "tdigest" "0.3"
       , template-haskell-compat-v0208 =
-          H.callHackage "template-haskell-compat-v0208" "0.1.9.2"
+          H.callHackage "template-haskell-compat-v0208" "0.1.9.3"
       , test-framework-smallcheck =
           H.callHackage "test-framework-smallcheck" "0.2"
       , testing-feat = H.callHackage "testing-feat" "1.1.1.1"
       , testing-type-modifiers =
           H.callHackage "testing-type-modifiers" "0.1.0.1"
-      , texmath = H.callHackage "texmath" "0.12.7.1"
-      , text-ansi = H.callHackage "text-ansi" "0.2.1.1"
-      , text-builder = H.callHackage "text-builder" "0.6.7"
-      , text-builder-dev = H.callHackage "text-builder-dev" "0.3.3.2"
+      , texmath = H.callHackage "texmath" "0.12.8.4"
+      , text-ansi = H.callHackage "text-ansi" "0.3.0.1"
+      , text-builder = H.callHackage "text-builder" "0.6.7.1"
+      , text-builder-dev = H.callHackage "text-builder-dev" "0.3.4.1"
+      , text-builder-linear = H.callHackage "text-builder-linear" "0.1.1.1"
       , text-conversions = H.callHackage "text-conversions" "0.3.1.1"
-      , text-display = H.callHackage "text-display" "0.0.4.0"
-      , text-icu = H.callHackage "text-icu" "0.8.0.2"
+      , text-display = H.callHackage "text-display" "0.0.5.0"
+      , text-icu = H.callHackage "text-icu" "0.8.0.4"
       , text-latin1 = H.callHackage "text-latin1" "0.3.1"
       , text-printer = H.callHackage "text-printer" "0.5.0.2"
       , text-rope = H.callHackage "text-rope" "0.2"
-      , th-desugar = H.callHackage "th-desugar" "1.15"
+      , th-desugar = H.callHackage "th-desugar" "1.16"
       , th-env = H.callHackage "th-env" "0.1.1"
       , th-extras = H.callHackage "th-extras" "0.0.0.6"
       , these-skinny = H.callHackage "these-skinny" "0.7.5"
-      , threads = H.callHackage "threads" "0.5.1.7"
+      , threads = H.callHackage "threads" "0.5.1.8"
       , tidal = H.callHackage "tidal" "1.9.4"
       , tidal-link = H.callHackage "tidal-link" "1.0.1"
       , time-locale-compat = H.callHackage "time-locale-compat" "0.1.1.5"
       , time-units = H.callHackage "time-units" "1.0.0"
       , timeit = H.callHackage "timeit" "2.0"
       , timing-convenience = H.callHackage "timing-convenience" "0.1"
-      , tmp-postgres = H.callHackage "tmp-postgres" "1.34.1.0"
+      , tmp-postgres =
+          H.callGit
+            "https://github.com/jfischoff/tmp-postgres"
+            "7f2467a6d6d5f6db7eed59919a6773fe006cf22b"
+            (None H.Subdir)
       , torsor = H.callHackage "torsor" "0.1"
-      , transformers-except = H.callHackage "transformers-except" "0.1.3"
+      , transformers-except = H.callHackage "transformers-except" "0.1.4"
       , tuple = H.callHackage "tuple" "0.3.0.2"
       , type-errors = H.callHackage "type-errors" "0.2.0.2"
       , type-errors-pretty = H.callHackage "type-errors-pretty" "0.0.1.2"
       , type-hint = H.callHackage "type-hint" "0.1"
       , typerep-map = H.callHackage "typerep-map" "0.6.0.0"
+      , typst = H.callHackage "typst" "0.3.2.1"
+      , digits = H.callHackage "digits" "0.3.1"
+      , toml-parser = H.callHackage "toml-parser" "1.3.0.0"
+      , typst-symbols = H.callHackage "typst-symbols" "0.1.4"
       , uglymemo = H.callHackage "uglymemo" "0.1.0.1"
       , unagi-chan = H.callHackage "unagi-chan" "0.4.1.4"
-      , unicode-collation = H.callHackage "unicode-collation" "0.1.3.4"
+      , unicode-collation = H.callHackage "unicode-collation" "0.1.3.5"
       , unicode-data = H.callHackage "unicode-data" "0.4.0.1"
       , unicode-transforms = H.callHackage "unicode-transforms" "0.4.0.1"
       , universe-reverse-instances =
@@ -869,7 +852,7 @@ let packages =
       , uri-bytestring = H.callHackage "uri-bytestring" "0.3.3.1"
       , url-slug = H.callHackage "url-slug" "0.1.0.0"
       , uuid = H.callHackage "uuid" "1.3.15"
-      , validation = H.callHackage "validation" "1.1.2"
+      , validation = H.callHackage "validation" "1.1.3"
       , validation-selective = H.callHackage "validation-selective" "0.2.0.0"
       , validity-case-insensitive =
           H.callHackage "validity-case-insensitive" "0.0.0.0"
@@ -885,7 +868,9 @@ let packages =
       , version-natural-dhall-instance =
           H.callHackage "version-natural-dhall-instance" "0.2.0.0"
       , vinyl = H.callHackage "vinyl" "0.14.3"
-      , wai-app-static = H.callHackage "wai-app-static" "3.1.7.4"
+      , vty-crossplatform = H.callHackage "vty-crossplatform" "0.1.0.0"
+      , vty-unix = H.callHackage "vty-unix" "0.1.0.0"
+      , wai-app-static = H.callHackage "wai-app-static" "3.1.8"
       , wai-extra = H.callHackage "wai-extra" "3.1.13.0"
       , wai-log = H.callHackage "wai-log" "0.4.0.1"
       , wai-middleware-heartbeat =
@@ -897,17 +882,17 @@ let packages =
           H.callHackage "wai-middleware-prometheus" "1.0.0.1"
       , wai-middleware-static = H.callHackage "wai-middleware-static" "0.9.2"
       , wai-websockets = H.callHackage "wai-websockets" "3.0.1.2"
-      , warp = H.callHackage "warp" "3.3.25"
-      , warp-tls = H.callHackage "warp-tls" "3.3.6"
+      , warp = H.callHackage "warp" "3.3.30"
+      , warp-tls = H.callHackage "warp-tls" "3.4.3"
       , websockets = H.callHackage "websockets" "0.12.7.3"
-      , wide-word = H.callHackage "wide-word" "0.1.5.0"
+      , wide-word = H.callHackage "wide-word" "0.1.6.0"
       , with-utf8 = H.callHackage "with-utf8" "1.0.2.4"
       , wizards = H.callHackage "wizards" "1.0.3"
       , word-compat = H.callHackage "word-compat" "0.0.6"
-      , wreq = H.callHackage "wreq" "0.5.4.0"
-      , wuss = H.callHackage "wuss" "2.0.1.3"
-      , xml-conduit = H.callHackage "xml-conduit" "1.9.1.2"
-      , xml-conduit-writer = H.callHackage "xml-conduit-writer" "0.1.1.2"
+      , wreq = H.callHackage "wreq" "0.5.4.2"
+      , wuss = H.callHackage "wuss" "2.0.1.4"
+      , xml-conduit = H.callHackage "xml-conduit" "1.9.1.3"
+      , xml-conduit-writer = H.callHackage "xml-conduit-writer" "0.1.1.4"
       , xml-types = H.callHackage "xml-types" "0.3.8"
       , xmlgen = H.callHackage "xmlgen" "0.6.2.2"
       , xss-sanitize = H.callHackage "xss-sanitize" "0.3.7.2"
diff --git a/horizon.lock b/horizon.lock
index ff9c66634f305ea799372efc5ac756f9a1e71b1a..5ad60ebdd6a312e8e91a1aed774d7b5d1371ce77 100644
--- a/horizon.lock
+++ b/horizon.lock
@@ -1,6 +1,6 @@
 [ { mapKey = "BNFC"
   , mapValue =
-      "644e29a84e154fd8949ccde9d93f7f3f9d0e19f5e096309825eb689e0770511a"
+      "616535df949d5e86aca8611d9739cace1dba3fd36a97c22613a588ea8f005d84"
   }
 , { mapKey = "Boolean"
   , mapValue =
@@ -8,11 +8,11 @@
   }
 , { mapKey = "Chart"
   , mapValue =
-      "1fd22fcb6ef6ba1d33c474205a8fd93dd64fd9b83190723f2d2319b632955582"
+      "7eb9428f566b7040e4a8bf3588dd4397b9764826ef05d96379dbfb4d5ea57fc9"
   }
 , { mapKey = "Chart-diagrams"
   , mapValue =
-      "8c9e678a4129f24b58a85cc8f5eb613fd44443932f672b7eb502606bcdc0f866"
+      "da71b258678dc9fe66fe1e991c24b7706a085c60046e5a9dc2826c902ffda0c8"
   }
 , { mapKey = "Decimal"
   , mapValue =
@@ -32,7 +32,7 @@
   }
 , { mapKey = "HaskellNet"
   , mapValue =
-      "b23be8f8da838be9b9b5f183506ba9c07c9b63ee7fd119acfeef9e1eb8f91878"
+      "51bf568ef13cd0eb1a2adbac80b7960b639d2e123d1e13880cf384b5daaf9ef1"
   }
 , { mapKey = "Hclip"
   , mapValue =
@@ -40,11 +40,11 @@
   }
 , { mapKey = "HsOpenSSL"
   , mapValue =
-      "adf63c52045842d9333ad1f72db7bc26bab3ba6d945729ab7f344067c1f7e027"
+      "3a586075ded33df964f003d2d0f9b69664b86c0ea4437960d44040f9c9023e68"
   }
 , { mapKey = "HsYAML"
   , mapValue =
-      "955dfa8eaa4cc8586cec4dd8054178c007aa564859b9730811126a9aabaa994c"
+      "a44e9b28adef1bbdb361d126f0c98a55efde04e27c3d0fb89eeff93f412d7dcb"
   }
 , { mapKey = "JuicyPixels"
   , mapValue =
@@ -52,11 +52,11 @@
   }
 , { mapKey = "ListLike"
   , mapValue =
-      "7e2fa731b4cb10c8f63350a951cf47d7e89d3673f49eab0ec40a222fd2d206fa"
+      "256dc12c78d235f58baa26025f5f6cc7056a6a66173724b9a918d207d5d0cf6e"
   }
 , { mapKey = "MemoTrie"
   , mapValue =
-      "025c006e90934e016388ef0e9970068ee052fdf13b343dd02a5f3148cdec3f50"
+      "e5550bf78db0e0e32a46a26693f7f7da8479573d0f24f03f7cd44bbfbb1538bd"
   }
 , { mapKey = "MonadPrompt"
   , mapValue =
@@ -76,15 +76,15 @@
   }
 , { mapKey = "PSQueue"
   , mapValue =
-      "4f99c25127c5bc623e40197e8ad93f1d0a9a2df73a386814744dd782f571a9ab"
+      "d2f80e7f97497120942bef44cb98902890c8901e9cb24e593a400b7891f35d17"
   }
 , { mapKey = "PyF"
   , mapValue =
-      "e8e4543a3529328e92df3736b1980d462f25d90136d631ed8d0c9d84a12038e9"
+      "0c64982cd382f2ac98f7629de0ddd016910107a4bb11178a9265f0914ace02d0"
   }
 , { mapKey = "QuickCheck"
   , mapValue =
-      "e1662ffc779c174a9a5488211a522dd0f7d478beecad82c8a35443a2eb788850"
+      "7023ada17f10c325d8ed5153b56629341a265d6833d64e2251662e2bc14adf94"
   }
 , { mapKey = "RSA"
   , mapValue =
@@ -120,7 +120,11 @@
   }
 , { mapKey = "active"
   , mapValue =
-      "1ecfbfea882c657f8ba2edb945c9ea0251164164b8ce9c44b12a6421f438b10b"
+      "47e32bbe2698f2166e4e8588def559ee0d261489bbbd0d203c36358e002c303d"
+  }
+, { mapKey = "aeson"
+  , mapValue =
+      "3448300829c03ae7c1381777881553e29b2843cb77a54d711603945b1c0522bf"
   }
 , { mapKey = "aeson-qq"
   , mapValue =
@@ -132,11 +136,11 @@
   }
 , { mapKey = "alex"
   , mapValue =
-      "48a84926ce5d6972bfb7509b01f2fc8f4f0c8b79b697ea9e7659b50c7bc6858b"
+      "d12b0723b1a22fdf237fa47dfef2084d98d98cfdc1f17fff134215a668a317fd"
   }
 , { mapKey = "algebraic-graphs"
   , mapValue =
-      "6e1850e668ad7df30fa6587a4583988ac42c734f2672687e6f300ae4458323b2"
+      "5bc7a25ddccd406e860edc65691ab3e5805689505648e4c335a3fc30090ed999"
   }
 , { mapKey = "alsa-core"
   , mapValue =
@@ -162,13 +166,17 @@
   , mapValue =
       "27f8e838e9b2c561e0ff708e931ad83ee87452188f75789dba4f0d67e466fe12"
   }
+, { mapKey = "attoparsec-aeson"
+  , mapValue =
+      "bb074565647f13c34f4a494dba95e655553ca8830aa2e906d4cbcf25da103d00"
+  }
 , { mapKey = "attoparsec-binary"
   , mapValue =
       "8b4c9f7de77714a1784114a382cc2ddc672bc48a24197cf7ea5bf86a4bb41b25"
   }
 , { mapKey = "attoparsec-iso8601"
   , mapValue =
-      "fc7b811c88200f60c1180662ff00bb01202a5f3074edbb797bdda9447420e5f6"
+      "e74d54aacda9053f4369f064c99d21f078bb4029ac177d9d6bca8f175abd5777"
   }
 , { mapKey = "authenticate-oauth"
   , mapValue =
@@ -184,7 +192,7 @@
   }
 , { mapKey = "base-prelude"
   , mapValue =
-      "432cd11ac433ebaf0302ff3cf521a2f75738ff804ebeda123f9c7387cd4533ab"
+      "3d8b8d3803988721a962b3231c9c4bf12b9b8a5833e6d2090dbdae6080051539"
   }
 , { mapKey = "base58-bytestring"
   , mapValue =
@@ -220,7 +228,7 @@
   }
 , { mapKey = "bech32"
   , mapValue =
-      "6a5ea1789ad5846b4fc6dd9d42e2053e4815f1dd769f49799694395534b84482"
+      "e25da39b21089c9bd07a20b3e1a909f95ce05dc9afde698b89e498810f74badf"
   }
 , { mapKey = "bech32-th"
   , mapValue =
@@ -236,11 +244,11 @@
   }
 , { mapKey = "binary-parser"
   , mapValue =
-      "640a5bdaf0c45155e9a46518e0fddae490271dae85c73859a7e654d50f67743b"
+      "4ca4ff97c6205daad3dd4e3f7a5c707f416d5409d4873d2701bc628e5df9d315"
   }
 , { mapKey = "blaze-svg"
   , mapValue =
-      "6977fd19a31e74d534a7c3fb5533e3fadfe9e74af81df5a5c18dfcca63f11e6f"
+      "4f3ea6ea76e7408ff2f4628f0e53e52e09a2af19c76e7b5fe83a20f7ad75af62"
   }
 , { mapKey = "blaze-textual"
   , mapValue =
@@ -248,36 +256,28 @@
   }
 , { mapKey = "breakpoint"
   , mapValue =
-      "5c52e6d11d51a4c41c7529905c72d3117c37a5cb64fb152adfb5621f564e37a0"
+      "c8747532c035f1cf40bbfc93f96f82267d32a4fc7b8eadbd651ef817b82e119f"
   }
 , { mapKey = "brick"
   , mapValue =
-      "c421b308ca4f14470084d6531ead0ce2a9efd6645084448689b13cee3c915267"
+      "89af294853f6f63ef649d91ca8aabbf72e0529f846f0168b40d58d1dece54172"
   }
 , { mapKey = "bytes"
   , mapValue =
-      "120f74c36c336bc91bd611b1bd49e3faf93fb4fab1757f000177afed1a9ac9f4"
+      "b494677244367c2ef4d56afe0e2e68bbe08832c14715512fda6d8bdb5e900525"
   }
 , { mapKey = "bytestring-strict-builder"
   , mapValue =
-      "2faa9baaba5c12368ff6f53edbc548241b414089a037d66067088882602b4ffa"
+      "9b18014fe61b7ab58ab519131f67fed3ebb9021adf760c65cdb6251791900ee7"
   }
 , { mapKey = "bytestring-tree-builder"
   , mapValue =
-      "0f4a7b167f0c5bd67969996be5fd56bc270ec90aa5f19fad72af2f35aca2bc12"
+      "d346a1a794c41a0fd01bacca977a19c6b1bed9e5a4e6a51c1683756bb7c11b89"
   }
 , { mapKey = "c2hs"
   , mapValue =
       "6d6262823310cf14a23c4fb5e0374a16a29b0ca6f667e9d0510f17383c3951b0"
   }
-, { mapKey = "cabal-install"
-  , mapValue =
-      "fd2294df1599586608fc7dd0797a6095f473d35c91ab21d93503e28a99fa73c3"
-  }
-, { mapKey = "cabal-install-solver"
-  , mapValue =
-      "83ab01d8bc94f20d343e44d059a87f5b104a998e8b4c44399e63a47372545418"
-  }
 , { mapKey = "cache"
   , mapValue =
       "a49e00288043640d75f03ee1ef20218116f36561ef2573ac7321fcf6b3881105"
@@ -308,11 +308,11 @@
   }
 , { mapKey = "chell"
   , mapValue =
-      "ce5fa04b6ef679d1809ac560d23decf9840d6479fa1644d48c78c60b71912cb2"
+      "6cc9209b8f2f150cc209875bc7b26c40848d7af67ff4175e9a917921bf82a417"
   }
 , { mapKey = "chell-quickcheck"
   , mapValue =
-      "b93fd5062669bc48aff276169e6a626272613ac600ac3d563eec416c25626f5e"
+      "3888a2fca8edfef385a0ea7e948fbf8821523dc2bba19492f64bd1b71ec6d7fc"
   }
 , { mapKey = "circle-packing"
   , mapValue =
@@ -324,15 +324,15 @@
   }
 , { mapKey = "cmark-gfm"
   , mapValue =
-      "6aa88368803d426caa87414fdf3cb2d8487a84865f5060731d96f704868ffc10"
+      "cc0dca94b5f59d677c5fc77cf475ac43b75bb5fde1414d4b67a64df1ede49baf"
   }
 , { mapKey = "co-log-core"
   , mapValue =
-      "51c5db97b1207b37c476b92723a478895d3b4bc21b3d0591a1414e943d5dd1df"
+      "ce6d49dc90b04f78f632d9d496e8cf02d469150ec2cbfd4c1ff8a73965636071"
   }
 , { mapKey = "co-log-polysemy"
   , mapValue =
-      "c3e4b2ba49049097e301620fa08121f614a7e6fb7900073423bdbcec025e562b"
+      "38d3db441dedee531dfc02a812ebff283302bd0d40e5ea72b42a370b6930e030"
   }
 , { mapKey = "colourista"
   , mapValue =
@@ -340,11 +340,11 @@
   }
 , { mapKey = "commonmark"
   , mapValue =
-      "048e3c5b7d41dd1e28667ac7d79b5ac904d63cec3b0d746ac407eaee040285dd"
+      "138243d220c6ca5bdcd113d9e33d8992bbfaca2c1f685d4f039122e840e20cd7"
   }
 , { mapKey = "commonmark-extensions"
   , mapValue =
-      "2ed7aaf85685767b41a41a1edf1d802014ba9f77eef6b1ab75455cf7a8bc1ad3"
+      "92b6d27223cc982be671124e511f2ea5f22b78b99d2bf1758a6024c16e6255bb"
   }
 , { mapKey = "commonmark-pandoc"
   , mapValue =
@@ -408,7 +408,7 @@
   }
 , { mapKey = "contravariant-extras"
   , mapValue =
-      "963d6ec64d29c7f839cbe1550e3ed2bce5459529634506e31ca7a7e9e9f51b6f"
+      "c6e17d714f72fedfbed0c2f6998bb2d5be8cebaa706512781510ae2d2516d70d"
   }
 , { mapKey = "control-monad-free"
   , mapValue =
@@ -420,7 +420,7 @@
   }
 , { mapKey = "criterion"
   , mapValue =
-      "b65e71a2b38f03d684c6e4e27976a4ec38ea28446933acc44834f58d7d515b28"
+      "351b4693372ca3e02765e03a0384848002a2869c5d2bac87bbad7043df9e89c3"
   }
 , { mapKey = "crypto-pubkey-types"
   , mapValue =
@@ -444,7 +444,7 @@
   }
 , { mapKey = "cubicbezier"
   , mapValue =
-      "fb9a58d863c162430f501bf34898b8050877aee7de6a2f49987644e147989d95"
+      "72274d39bd6341c1762d192b09a109a51598de4e112508fe9405887e61deccb5"
   }
 , { mapKey = "cursor"
   , mapValue =
@@ -516,7 +516,7 @@
   }
 , { mapKey = "dbus"
   , mapValue =
-      "53b6df9019fe7d1b3da2167d7a790ac5a3766238a26de94d807e547ac1e84779"
+      "f22f06d57e7ad1e4bb6f15b867ac849626b82008af49c2240b0d989a65e2d983"
   }
 , { mapKey = "deepseq-generics"
   , mapValue =
@@ -524,7 +524,7 @@
   }
 , { mapKey = "deferred-folds"
   , mapValue =
-      "e6b0613899f85dd55ed719e86113e65913925fb827e264cd2d9399e037a2c058"
+      "3bacd756efe4b18b1b7961c45a0cb106d37df2d3fd3987f4a7dca8984718c8c4"
   }
 , { mapKey = "dense-linear-algebra"
   , mapValue =
@@ -540,7 +540,7 @@
   }
 , { mapKey = "dependent-sum-template"
   , mapValue =
-      "be0002c5ab5307435366b7076ac68253b5459b6001bb7884afc4472e9fd13467"
+      "9a06146d462020cb8b5bcdcf21e38bc05b7d770354d9473c59925df9b9812e69"
   }
 , { mapKey = "deque"
   , mapValue =
@@ -552,23 +552,15 @@
   }
 , { mapKey = "deriving-compat"
   , mapValue =
-      "fda04f4a6b5b6acd56a0b509a1e730c7fac374c95479a2f641dd7f6cfbf4aff4"
+      "0d675ee19c613f04962c128b6992b4ead0d300b1c5441fe310441f5beb170092"
   }
 , { mapKey = "dhall-docs"
   , mapValue =
-      "a2bf1512719edb483ec38c1b3af935a1495c92f39f8c0a84a02768ce5e36db24"
-  }
-, { mapKey = "dhall-json"
-  , mapValue =
-      "146a949279ed40db6f9d85603601277aef9703d7c107e42f258186e8bd56e4bd"
-  }
-, { mapKey = "dhall-nixpkgs"
-  , mapValue =
-      "99d04e2fc641cba3fab78d2b779c7ebd1a1ba60c5ac40d25aeee85612c79a4a0"
+      "6903b09c51e4be0904b6050d1141ee5fec3957915838a9735632b4b68d3e85c1"
   }
 , { mapKey = "diagrams-contrib"
   , mapValue =
-      "47716536df091869e2b6502c6311314df850010c300080b2ea68e6ca00a00085"
+      "bb88d5da2a0deb394b1eb7857e46bde1e18ae4fa4af0908d022d1f8ab4808476"
   }
 , { mapKey = "diagrams-core"
   , mapValue =
@@ -576,7 +568,7 @@
   }
 , { mapKey = "diagrams-lib"
   , mapValue =
-      "6a96ee08dfcd34dee0a20adb47c1dfc957fa5a6e1a0fe4839fb7f5fcf423f21f"
+      "f4a7d089317e4ef43ab4352541ffa6e8a15ed7c60dd14f6326e7b6a4f22168a3"
   }
 , { mapKey = "diagrams-postscript"
   , mapValue =
@@ -598,6 +590,10 @@
   , mapValue =
       "f520683e1b973557c1e4cc13147008b1a7defe98de754776c66700fcf52fe7d2"
   }
+, { mapKey = "digits"
+  , mapValue =
+      "fa432d2afe134f1f0e439f47dbe2a87f229931ae3e50dfcc055e28c4f0c54456"
+  }
 , { mapKey = "dimensional"
   , mapValue =
       "e5ac428443dadd00529f541175eb50a18366330b91664270ec04ed66eb05b3cf"
@@ -612,7 +608,7 @@
   }
 , { mapKey = "dns"
   , mapValue =
-      "52fcf9010fe3a96c23e5cc61333eb562d55234896615b56ed5a7e432482e8dc6"
+      "1b8d6e112342557b47f90f648a4ae9f70a950759921421f19b6224f4d6b3e96b"
   }
 , { mapKey = "doclayout"
   , mapValue =
@@ -624,7 +620,7 @@
   }
 , { mapKey = "doctest"
   , mapValue =
-      "4f22dde5a11548e2d6eebd2c520323f4e31c5163ff25b2a4bed6efd8e09859f4"
+      "313b6b5546e8b8e74080d9ca3a6accf758dd085dc8dc60ee6dd272d350d5785d"
   }
 , { mapKey = "doctest-discover"
   , mapValue =
@@ -656,7 +652,7 @@
   }
 , { mapKey = "effectful"
   , mapValue =
-      "b5f0f27374d87ab158f04f8b23a27889355f416aa5f284c28c8e8e351709f584"
+      "53b48f32d72313c049bad8c52258bfb72675be56b2a1d115ecd0bb7da687b257"
   }
 , { mapKey = "effectful-cache"
   , mapValue =
@@ -664,7 +660,7 @@
   }
 , { mapKey = "effectful-core"
   , mapValue =
-      "908dc346cdd0b3ac28ae758fa4e8cfde21f314ffd37373f7b908475a54520d03"
+      "87e522df34912eb6acc13fef48ba103181cc07999fc75d4eab79a1a2b91a0d53"
   }
 , { mapKey = "effectful-th"
   , mapValue =
@@ -690,17 +686,13 @@
   , mapValue =
       "ab0148154bda9abae3e03e1506213f33d2da3386dd4e157f76f396b49116b1ac"
   }
-, { mapKey = "ema"
-  , mapValue =
-      "de96afb72839aeb81433f63f1e4d38aff4df25dc4fd38194489a6070e469dff0"
-  }
 , { mapKey = "email-validate"
   , mapValue =
-      "ec037dab3dbaf16e9bb9bc632b7cf8a852355ec3e7e53ab21e896c2b722a4114"
+      "20056788a5e30bf09a215536ab7cf7e77c9d77ab7fe0cb3c1d421f5f42b5e18d"
   }
 , { mapKey = "emojis"
   , mapValue =
-      "1b9e5bee748262fa675df19eedd79458d8f046d9c30177ca3a156a559012af79"
+      "c0375e5db4f0e17a2139af7e73c69bb8ca86b73c7942b6d4f710d107d6cbc55e"
   }
 , { mapKey = "enclosed-exceptions"
   , mapValue =
@@ -742,17 +734,13 @@
   , mapValue =
       "561ccb5c1f18178d4a94c90e117c691f1e64e40fcdb1fd5ffb44f1e64a53c5ee"
   }
-, { mapKey = "feedback"
-  , mapValue =
-      "33c6daca9f74c70a32213117ea490fe548eac39a577d8d61995d494532176321"
-  }
 , { mapKey = "file-embed"
   , mapValue =
       "20f95a1bdb2a82adc27ad36caccea5afa104ed849d597dfea7cff2a0a020608c"
   }
 , { mapKey = "filelock"
   , mapValue =
-      "ccb74b597af453883dabf689f45563117e2f8aa17ad6267f582fa761b8d9b889"
+      "f04e0dff81afb4e284ca9e410f08e5602ddaddfdb53a4b9769dc44436fcf5a50"
   }
 , { mapKey = "filemanip"
   , mapValue =
@@ -788,7 +776,7 @@
   }
 , { mapKey = "focus"
   , mapValue =
-      "f154ebbcda3041eb65109d84ceceb8041778cea2ef7a080ae454ca863889f340"
+      "b2f56c1f0a46c3bc46b8ace0b510c65ad9dd73b89683ed3c713db7bf5b06fcea"
   }
 , { mapKey = "force-layout"
   , mapValue =
@@ -808,7 +796,7 @@
   }
 , { mapKey = "fourmolu"
   , mapValue =
-      "f79b2e740530d1d02cb57fc6765f59b542f8d69ee0fdfd8edf3a5ef65c826793"
+      "4e853d48ae63576751d5e3abd3116c366771e78185e45e41ef8fdef8c93b510a"
   }
 , { mapKey = "freer-simple"
   , mapValue =
@@ -872,7 +860,7 @@
   }
 , { mapKey = "generics-sop"
   , mapValue =
-      "ec86357a62c8787cb72565f94aa07b89dc09dc6425bb6004ece276e9f3000323"
+      "09af52c6f40d8a7378f4174a902bb470c9e322f79d4690748f03665ec7920be6"
   }
 , { mapKey = "genvalidity-aeson"
   , mapValue =
@@ -912,7 +900,7 @@
   }
 , { mapKey = "genvalidity-persistent"
   , mapValue =
-      "d5ce476511392148ed967417e1c92be0553203888e545603e4578f4144fd3a34"
+      "847359bff53602e2a71ed4af3253ac788852a5c47b404fbd6976b2c68404ed5d"
   }
 , { mapKey = "genvalidity-scientific"
   , mapValue =
@@ -928,7 +916,7 @@
   }
 , { mapKey = "genvalidity-sydtest-hashable"
   , mapValue =
-      "775f29a2472e7c0a5046a7bb990f898ca21c273d26e64db9f992c97a5f754e81"
+      "db0fd7893c01ebb9c8830c483f5364b2ea8d679575aa8dd00c5c471d0e509111"
   }
 , { mapKey = "genvalidity-sydtest-lens"
   , mapValue =
@@ -948,7 +936,7 @@
   }
 , { mapKey = "genvalidity-unordered-containers"
   , mapValue =
-      "b2b035a404165dfb8c4b74e32fd96254cdf03b8de1067c5acffed1d82689b2de"
+      "d5cb877ef88cc417282788326d54b96bfce35bacb1f759db5195442af274f0b3"
   }
 , { mapKey = "genvalidity-uuid"
   , mapValue =
@@ -964,19 +952,19 @@
   }
 , { mapKey = "ghc-exactprint"
   , mapValue =
-      "001b5c14cbc74f64c37029d50bfcb2376d463673b2108725e2856a507b471c82"
+      "6e96bf00d45a8b48a1886870d69c677a944e7facb58cb12b589acea1a2b1fc3a"
   }
 , { mapKey = "ghc-lib-parser"
   , mapValue =
-      "5f6fecd386b9bf0a7a7f0c96474c93f5193df0167353b9d5b6569a7aeadb4c7c"
+      "0ff97e8d36472115f2dca4fa7376d554ce5fa9c6cf921cfaf27a91fca30f7b97"
   }
 , { mapKey = "ghc-lib-parser-ex"
   , mapValue =
-      "43e147f82c777ea66bc8b14806d03d5857c328ce8a6c451fbd2239663a11b076"
+      "58ca5eca3fe0793f3096308ab9b34bcedcac762931b2d9090fe7e9d4e3ebb2c5"
   }
 , { mapKey = "ghc-tcplugins-extra"
   , mapValue =
-      "f1001b03ec72bace6c3c4fe45f7ea2e79dfa0a1028e939b0bdb4b78257785a96"
+      "46824462422feae84e0789728065ef7cd7111f8363ce762c9e636ddedab186a3"
   }
 , { mapKey = "ghc-trace-events"
   , mapValue =
@@ -984,23 +972,23 @@
   }
 , { mapKey = "ghc-typelits-knownnat"
   , mapValue =
-      "ef2dfb5624b6a9c4ceabf1434adb03748950d39122faf23c283b317926bc00f5"
+      "220ed8be985ca30213cf1d43677e893b9e1e4ce8fe77161abbef6a3da50c9206"
   }
 , { mapKey = "ghc-typelits-natnormalise"
   , mapValue =
-      "cc5e144d99977ce9512883d242362b8b1f19c507a56fdf9cd8309b96e4edbd36"
+      "475c5355ae282ecac000f5eb35c08487dd27fded707c6060461902627e79bd3c"
   }
 , { mapKey = "ghcid"
   , mapValue =
-      "47ace357ce3654f9b4a8e3191834e9386b829313da935fbf3225a772949c9c5f"
+      "4f5ea84ea90fb71c97df548caa9104f8e38920bdaff54afb5ce1e07dff52838d"
   }
 , { mapKey = "ghcide"
   , mapValue =
-      "81ba30bf0bdd8f42d49df7a451f915bf766b4b62d987b5e3061f48235b9beb22"
+      "862d598a9c79eddb692c6acb2e3e49a2a016a184f9d988a9b344176780b43f7e"
   }
 , { mapKey = "ghcide-bench"
   , mapValue =
-      "8f4879808f8a5ccbe7237f310a105e8321642e061c75a9523e87bd8c7a162a87"
+      "91c2bb34d3db5a2c04d1ffe83840fc292238274d9ad349a7f18c281bfa042f34"
   }
 , { mapKey = "ghcide-test-utils"
   , mapValue =
@@ -1008,7 +996,7 @@
   }
 , { mapKey = "githash"
   , mapValue =
-      "8e9b483a6b55aeb90add9765fbe926069c4dcba6c6ee3d74e42cbcd208849590"
+      "e82b31b7ad7af08cc397b411d5dd3a16a415ec5d64fa2b6d2913a97d514de355"
   }
 , { mapKey = "gitrev"
   , mapValue =
@@ -1044,7 +1032,7 @@
   }
 , { mapKey = "haskell-language-server"
   , mapValue =
-      "e25da9033bd28198372d3a1723f2441cbea67cfc8ae1741c2d090b8dcd24d1dd"
+      "1d80a35b6c5f714726dbbf029820f7ff7c9234a506e75b00acbf09239f2a6ca5"
   }
 , { mapKey = "haskell-src"
   , mapValue =
@@ -1052,7 +1040,7 @@
   }
 , { mapKey = "hasql"
   , mapValue =
-      "34cd25afdc29108c6e9829a92cab2f0b3d55fa00e2426227627e64e15abf22eb"
+      "f45a2b041b8d804526f21c7d07b7fe3d04c9e7ff871f3031167d0b11323273b9"
   }
 , { mapKey = "hasql-explain-tests"
   , mapValue =
@@ -1072,11 +1060,11 @@
   }
 , { mapKey = "hdaemonize"
   , mapValue =
-      "ab4f90bf1de28057460801b3eb68e3785e2e5bba6227df52d511bf7c209905f1"
+      "330a2beffa84f97c76efe2cd1469304a8c3bb936703b574774657e86786388bf"
   }
 , { mapKey = "headed-megaparsec"
   , mapValue =
-      "f2c3aae26e23112730ed6571ee277311220c693c9f04dc88c8e7c518532b1b92"
+      "51c224ca6054fd369c07ec386d1cb9053d033ebb35c59c8af741940a858fbe65"
   }
 , { mapKey = "heaps"
   , mapValue =
@@ -1084,7 +1072,7 @@
   }
 , { mapKey = "hedgehog-extras"
   , mapValue =
-      "bd3311a2670c6926cfb96c239d74517a5ffb7b89189e9ef0d2f36f1ef116b7b0"
+      "1a6a3966034e91ba96860a744b3d5fca6f88d14ae7619d01a470e32fe5c5a39c"
   }
 , { mapKey = "hedgehog-fn"
   , mapValue =
@@ -1104,7 +1092,7 @@
   }
 , { mapKey = "hex-text"
   , mapValue =
-      "a43b5373598e3615cbc89230d774597741a7cc058453aa401e426104524f9e7f"
+      "8e0dd170b409715da17e50e2701b548b1441a8d56305ba9003e2ef6bd17a449c"
   }
 , { mapKey = "hie-bios"
   , mapValue =
@@ -1112,11 +1100,11 @@
   }
 , { mapKey = "hie-compat"
   , mapValue =
-      "0b066459a69e5fc5511778be51746887339ac46f48d897f961d8fa3e2e5d303a"
+      "acc2b4c4a58d59dece5bcdadb8c547738d6d78a43527001d0b02895ba433f9bb"
   }
 , { mapKey = "hiedb"
   , mapValue =
-      "85032ccc52f58f48569fe51c54b27f7133bdd036bcdd8b8e7093fc9bc8cb1ab9"
+      "56564981597071e01223e4a7e066c707036b351d3b743e108df5855c6a04134c"
   }
 , { mapKey = "hinotify"
   , mapValue =
@@ -1128,103 +1116,95 @@
   }
 , { mapKey = "hlint"
   , mapValue =
-      "de9cc7a97e0a5b79de08dddedc2bbdc0645d93db23108656b43d5328ba50599a"
+      "e96b7b6486b4600897a4b3c7b46da3a71e4b173ba9eb6fbf36376ec32d93e5dc"
   }
 , { mapKey = "hls-alternate-number-format-plugin"
   , mapValue =
-      "3904d8d4f5071d0f2c066460c2975324113dc2e8dc150b2144b495b147ec2cb4"
+      "606d72afd68e1ed498092a8c858bfcdc5c546d096b21f66cbc661feaf98d2c4a"
   }
 , { mapKey = "hls-cabal-fmt-plugin"
   , mapValue =
-      "027bb2f34ad16f8aab3dec6d05f5e385205b5a21002bbadb900178ff45ec9b7e"
+      "773a34e46dcd46c968ed6250989370c73a918b21ae0e902bfd615e5435136438"
   }
 , { mapKey = "hls-cabal-plugin"
   , mapValue =
-      "8ea6b3d0f7f1f1aaf0e010a2aea3117a67fc2bb6719bb1f14722ac2437c94e9a"
+      "ade85f9848af041682e9ed92463b0612d88b42525e8a537af5f8492fbd6105e2"
   }
 , { mapKey = "hls-call-hierarchy-plugin"
   , mapValue =
-      "09d95dfef15a9b3ee01f76fcb91abc29b3aefd8e40bde443f249ec63398bbbbe"
+      "1a9b11cb159d18afad529f72829ebd1bd9f2e8a790b7885c0f78cec4f2425404"
   }
 , { mapKey = "hls-change-type-signature-plugin"
   , mapValue =
-      "5a4a088fabded00f5ccc1fc10ed5f3dfac72e6615055713d595a2d0e29ed8feb"
+      "7c2c58212e844d761a350d05dec83f58088c724b05d371f1a2099028c273ecd5"
   }
 , { mapKey = "hls-class-plugin"
   , mapValue =
-      "2be0839031bbf93215a7283c596cfb7e9bdd9871a4378c746dfb7a8d1a0cfc60"
+      "15995f1807a8bf79ef5a1bfe3d41969b4be0553fb60cf9c6ee2667669fe6f7f0"
   }
 , { mapKey = "hls-code-range-plugin"
   , mapValue =
-      "6ba56d3399fdd075e86eebc8d3a6458a01dcf62e3b93d420c9b7a4334ca4c962"
+      "ff11ead815c3d959bdfe32550107ec330d9a6c05468c7eb8189eec237e172fbd"
   }
 , { mapKey = "hls-explicit-fixity-plugin"
   , mapValue =
-      "46d189d85621f72f6807925600b8c098fdebe9318e66aa8ddf9f4f2c67e924e4"
+      "809744eaee131d755038972f5bb6561d90521f8fbdd7944671b1b36ce165e51c"
   }
 , { mapKey = "hls-explicit-imports-plugin"
   , mapValue =
-      "4a85209ab0a20cf18dbfb52c9e38cc2af273037df266588347d8603f834f2263"
+      "ac694b86bb2043a0da16377ea32b0f08f85711b47dd61e5a3b19688e9c30fca7"
   }
 , { mapKey = "hls-explicit-record-fields-plugin"
   , mapValue =
-      "4c340e708b29eae8668dc4b7ac2dd2cd7a6e1bfce31d2eaebf800cf57b1df5d9"
-  }
-, { mapKey = "hls-fourmolu-plugin"
-  , mapValue =
-      "9e33f752440d426b73345011516d65e8fea47616083bf2961a4f6586ab3597b3"
+      "e34cf05a00bc2a29c2281290f76289082f90397cd498994d07b773bde10f13a6"
   }
 , { mapKey = "hls-gadt-plugin"
   , mapValue =
-      "d8978ac5269a3c67e81dd71b701d80f075c5b75f1822056568b038582ce9cb63"
+      "c7b77b6b511ab2be4be853dfb5ef7fe217fbbba6654d5a81c7cddaa6404d1f66"
   }
 , { mapKey = "hls-graph"
   , mapValue =
-      "149eb1df7e78401946ddbe1c72d9bf39c62a0877f7df1caf7d31d33546a901b8"
+      "ac21343b71c54d4eee17bbe0224fa68c05bc9fa5988e7a300116aff3ee27efe7"
   }
 , { mapKey = "hls-hlint-plugin"
   , mapValue =
-      "ecbe1a140283da2e37758cccce09b03287c476f80b4268aa75a336332bae04bf"
+      "aeab2415edd8a1e8abe8abf082313ea981ed5b908d8426124cd626f8b635485d"
   }
 , { mapKey = "hls-module-name-plugin"
   , mapValue =
-      "07a9b28d8c6893e7db44e40de66e85956f5664256b2461d009506dffe0f42450"
+      "58f494c709134ada226b8b10c98db9f8e64b923fbf6c3df0d77ec92a7b5421a5"
   }
 , { mapKey = "hls-overloaded-record-dot-plugin"
   , mapValue =
-      "8473837f38f71e5541f145d50cae0dd7bc30e0cab4dc14b1c2962b66d1a9f60e"
+      "2f03ecf4e2871b9885c366d339745f97f339ccea3b55a0c68c5ea47deb2a864d"
   }
 , { mapKey = "hls-plugin-api"
   , mapValue =
-      "dc67309646fa206902ab15ac3395f88482c2d32dd64efc7234c98616cfeab452"
+      "394b28cdab63b38e1642fc6fa85ca67857235dbb0f5d89d3111c2ba1f434cb28"
   }
 , { mapKey = "hls-pragmas-plugin"
   , mapValue =
-      "87f639035815b8fd1a934776c00f8f9fb6ab94585b6997afd45044844f57d1a3"
+      "8a79d426a570f18e23c016697308c3d2c2d649ed29b427c018129c0c1c705053"
   }
 , { mapKey = "hls-qualify-imported-names-plugin"
   , mapValue =
-      "55f14bb8c727ddbeea1d1728b7661851cc22bc6305f5340e27afcb1dad2f95f2"
+      "3f972242fa0dac107e3e9a4826d8a9cb407179e04f9bae534f078ee9fc133c79"
   }
 , { mapKey = "hls-refactor-plugin"
   , mapValue =
-      "d0b9523a80615828e327582effa610e64449eecf0be1fba8659003a5b16d7204"
-  }
-, { mapKey = "hls-refine-imports-plugin"
-  , mapValue =
-      "811abfdc526fa2eb1a403cdca264a9eb55342bbffd9fd9e7fac974ea57d8865a"
+      "5d36a6a7249dbb85c43ff923f0d8033332cf6f79fd3e2dad4b96067bde480ef1"
   }
 , { mapKey = "hls-retrie-plugin"
   , mapValue =
-      "01f6f8785e1e539a1af035cf11eaacd66857196c8d35e97239f689946d790cda"
+      "928adebf36bedae54ec00f4eb7f35a2eb9107053ac4d4c8693ab487dbe2c5ca6"
   }
 , { mapKey = "hls-splice-plugin"
   , mapValue =
-      "29469f758a9ad236457e67430229a4aee4b413a6dcc7c0355ea5b38d18a84c45"
+      "3e27b99c4065c75b5ec3e6207d29a49748bdb2368bc0d2156a0f7fc1d8071717"
   }
 , { mapKey = "hls-test-utils"
   , mapValue =
-      "3fc0fae147ece581e218861e4a6cb16fb74db7cdc52fd968e94148b64bd9ed99"
+      "736b6e8bd716787854b17ee1cf070ca2bf7c7d5829e950c6be1878db3f11e431"
   }
 , { mapKey = "hnix"
   , mapValue =
@@ -1246,10 +1226,6 @@
   , mapValue =
       "d1f6c9acb24702266bf37fd6fe398e4a481e9f372382fb9c7027eb42b62b5bac"
   }
-, { mapKey = "hpack-dhall"
-  , mapValue =
-      "7e0bd467db3ca0dc4660787c74d0a3d730a05b066ecb6faef5a0256737f1d2c4"
-  }
 , { mapKey = "hslogger"
   , mapValue =
       "033eafa5b1f2e181ef8c615be18d3c5c592e7db131af110905a72a1741f3e020"
@@ -1324,7 +1300,7 @@
   }
 , { mapKey = "hspec-golden"
   , mapValue =
-      "6728f2a457f44ed273b0d3969e591139f7656e87cc9038c12b2a7fc5593e9b28"
+      "bce9e69701205fd35b27fb3abf0ba0caf59342427cbafbc4c40ea9d3ba2f21e5"
   }
 , { mapKey = "hspec-golden-aeson"
   , mapValue =
@@ -1332,11 +1308,11 @@
   }
 , { mapKey = "hspec-hedgehog"
   , mapValue =
-      "2493ec2223bd5c02f38b27cf21621bcc6ec8b70042fc39745de3fdc565d3e227"
+      "63b6bc16b648fe44d7609a17dcea409471fca7279e6461ea049032b998d5d461"
   }
 , { mapKey = "hspec-megaparsec"
   , mapValue =
-      "f6e94ba3cd494502422516c37425fbe1b77d04edd3a7031e77fc076c173aac5b"
+      "24515721b1b62f60208ea9f4eb3729df9efc8f7032039c4368a3d0f1e928ba28"
   }
 , { mapKey = "hspec-wai"
   , mapValue =
@@ -1360,7 +1336,7 @@
   }
 , { mapKey = "http-api-data"
   , mapValue =
-      "d5f49514987f287244663c847e3983c98b2e9f779898dcf303565e831b369317"
+      "dcd90e9b92ca8da19433d5aa535669db4007f2aa27ea1ecfcfc4ad588971316f"
   }
 , { mapKey = "http-common"
   , mapValue =
@@ -1368,11 +1344,11 @@
   }
 , { mapKey = "http-media"
   , mapValue =
-      "be23cf00bf66ed21aee2db18c979b50aa1a90284c46185d2ef466aaa20494b65"
+      "29d954b366da56f82faf539fcbee390926edb2287bc8b221d93820013c3e8005"
   }
 , { mapKey = "http-streams"
   , mapValue =
-      "46371dda1efd7992dda0a5600880bd516633e484fc02c92fc6ab2c1cfb025df5"
+      "f6b10404539159df1c42b4bc7ed29f45c023bd8b7b8b780ae15c9f156f562aa5"
   }
 , { mapKey = "hw-aeson"
   , mapValue =
@@ -1432,15 +1408,15 @@
   }
 , { mapKey = "indexed-profunctors"
   , mapValue =
-      "c2398c6b060e82b15671976f3d4fdf4b06c1af9b9c7605d1bb3b3ee9145f70d3"
+      "07e0fda09543523d9f5434aff169fb6c2ef20a50a5646a825e73d1113a3698e0"
   }
 , { mapKey = "inline-c"
   , mapValue =
-      "0b560e39d5052d3f5ffc4595452320dad872018be7d288c612c2cc08090f227c"
+      "96a2ae835304b89328c01934860af6a06a3b5b212d8aa4e436d6b01731a0119d"
   }
 , { mapKey = "insert-ordered-containers"
   , mapValue =
-      "01d8772de4b4872200b6fd9bdd8d71aa6272ce2b5557ffff522c0e74176ca1f9"
+      "a45fe34911ad1f5265fa40e04d6b24fbf606cca169c98dc57ee733d267a6b18e"
   }
 , { mapKey = "int-cast"
   , mapValue =
@@ -1476,7 +1452,7 @@
   }
 , { mapKey = "isomorphism-class"
   , mapValue =
-      "fa6c95c51fb77df590f4ada08574a149838862b19010192cfcd0b78c161e64b8"
+      "6bde6de1d6a9ded497d6aa89797b65cfb359f72eefc137836d3a52aec2fcb177"
   }
 , { mapKey = "iwlib"
   , mapValue =
@@ -1488,7 +1464,7 @@
   }
 , { mapKey = "jose"
   , mapValue =
-      "06f4ebe228a54a61a626ab6b2583f56d698fd69bbceaa6d9a1998244c85d1120"
+      "dc833a184a6f6730b194d27e6ebef29a8377406ac8c0a52ef246bf61db59dc51"
   }
 , { mapKey = "jose-jwt"
   , mapValue =
@@ -1552,7 +1528,7 @@
   }
 , { mapKey = "libsystemd-journal"
   , mapValue =
-      "04742a83eff2a58ccdf17dc8ab60ae6a561752332238966e631006a4b042fbe8"
+      "95cbe72e50999396c9ba62d0794427fb54993b79f5719290dd31680d5be4468a"
   }
 , { mapKey = "lift-type"
   , mapValue =
@@ -1564,7 +1540,7 @@
   }
 , { mapKey = "linear-base"
   , mapValue =
-      "48045cabc9f93fe98fd7c7bc85d72a176e4f6fda9ee43225011797a9c7cfffba"
+      "3a172161f36538c34976f211acbf8f2a271545dcabecbd7bb014eecff834cbc2"
   }
 , { mapKey = "linear-generics"
   , mapValue =
@@ -1572,11 +1548,11 @@
   }
 , { mapKey = "list-t"
   , mapValue =
-      "9545ffea4674a07969267378c366007b45e02304613ba61d6f1ed17c7e89bf11"
+      "ac067f31cb9b693df7797a5077fbea6b3f7fcc3b840d2fbf9540be98f8bcc910"
   }
 , { mapKey = "list-transformer"
   , mapValue =
-      "313f34118a702ab81cc049bf8a43dbc58ac975b2c80d18075f827c292cb530be"
+      "dfc1a96eff6f09f3ab4a03db7ba4602aa64c708f0e884c0ecfeb1f20ad03ba33"
   }
 , { mapKey = "lockfree-queue"
   , mapValue =
@@ -1596,7 +1572,7 @@
   }
 , { mapKey = "lpeg"
   , mapValue =
-      "eaa1cc9e4c86e0d6656f4204ca3ed249923997b8ff39a1ad75042ba5acb8a1b5"
+      "fd789b59dc7b23ff370b417479e59a326c3eb4a9ce2dfc3ad0b11b749f61bad3"
   }
 , { mapKey = "lrucache"
   , mapValue =
@@ -1604,15 +1580,15 @@
   }
 , { mapKey = "lsp"
   , mapValue =
-      "54d0eed5828a70e8d0838bcda0b8c7edc5faa88b5c80d2f8644e8f252467d040"
+      "c9acdb6bdb71cfd9c88f9aacf4e4aa9b93ec3363a47a27a7c34ebcabae0963ab"
   }
 , { mapKey = "lsp-test"
   , mapValue =
-      "07bda72ce0e3827147ddbca0b4aa8f809740e0f732d22720d6e804364ac48dd2"
+      "1584be7f5afc54c6dd93cd1481293ec21a9f9f37baac3574869aacb7c7d3b411"
   }
 , { mapKey = "lsp-types"
   , mapValue =
-      "d3dc25d18f11d0898e305f83f447c8857e00a16b54d4f7fe6b9019990f728f74"
+      "6d3ce787af32e6ccc298988b148a8427b48c233bab6aadf421038eb6a38430e1"
   }
 , { mapKey = "lua"
   , mapValue =
@@ -1652,7 +1628,7 @@
   }
 , { mapKey = "markdown-unlit"
   , mapValue =
-      "6ae49957b826dd7d4352cc5c986781f5ed4b1a9daff5b69d68c5b4039a0f95bf"
+      "5f1f85bab9dc236a882417264a21df7ceef68a7ed2a307b2c38ca285c82daf13"
   }
 , { mapKey = "markov-chain-usage-model"
   , mapValue =
@@ -1672,19 +1648,19 @@
   }
 , { mapKey = "mfsolve"
   , mapValue =
-      "7ddef614c3df71f868519c5816340eba2488a4fde7906862c7e0829ba3523afb"
+      "7c527724fd6f326abb961e6a7947a322ff006f9cfdd37f469d4620d9f1f59c98"
   }
 , { mapKey = "microlens-aeson"
   , mapValue =
-      "4b90938e24e215eec900b96bf909ba060c7aed66a06f4c97c940e6f2063c4e63"
+      "631f331f4d71474f64902c40528f5bbee951904fb54d1cabdcad5a8568637502"
   }
 , { mapKey = "microlens-ghc"
   , mapValue =
-      "c519d2169fd18414c516cfba009f6df09f65c403c42c859ebeccc4063f224c74"
+      "6b6338dac8cc728b911ebd83ddbdf40178016abe390ce1d3bdc0377d6e468894"
   }
 , { mapKey = "microlens-platform"
   , mapValue =
-      "4965e8c13a59c909ad6819012b563dc5fa8edb92f17ca7c00f430450fcf260ff"
+      "8444b48113d385327599adf7b6e72d149fc12844c79ce119d21b79e0f3c0d236"
   }
 , { mapKey = "microspec"
   , mapValue =
@@ -1698,10 +1674,6 @@
   , mapValue =
       "2abee3564aa18e415b9111a66bd28e8f9dd51c51d4504a51c0d0a82d2d96a35d"
   }
-, { mapKey = "minio-hs"
-  , mapValue =
-      "971f778b8464246b3b6d56051e9ebcaf7a834d5673e6cd005a562afa9bd2d161"
-  }
 , { mapKey = "mmark"
   , mapValue =
       "0b5a2a3f1cdd8bba4d1f272bf4966ec97bca6862bf1fdcca022c17f330aa80f5"
@@ -1712,15 +1684,11 @@
   }
 , { mapKey = "modern-uri"
   , mapValue =
-      "d382efa387508d506a1f5ec00d66c8c35a4c1c59ef35002cc567e15250947798"
+      "49411928c6b0b612b6d2872bdfcf87a2e9a3846f28b83041684a06e301f11bfb"
   }
 , { mapKey = "monad-logger"
   , mapValue =
-      "19d6dfd00179274588a7ebb524351087310a92a8f6377fe5b15b30da33f3cbde"
-  }
-, { mapKey = "monad-logger-extras"
-  , mapValue =
-      "3ec37844effac0f341e0702192b4c4857c273791c34e720a630f3bdcbdbc118f"
+      "be9ba3f64044a27a31def5c24f4c23714a7a620511c36bf4cc4c9a8eab57d532"
   }
 , { mapKey = "monad-loops"
   , mapValue =
@@ -1744,7 +1712,7 @@
   }
 , { mapKey = "monads-tf"
   , mapValue =
-      "3b158a58448c9de48de8306995590339bac1dd26ccd31c58fd57299376d900a2"
+      "d57f36c81e307da3f8db7672b8e72490926744a3b5623ae112ace59e867851c3"
   }
 , { mapKey = "monoid-extras"
   , mapValue =
@@ -1752,7 +1720,7 @@
   }
 , { mapKey = "monoid-subclasses"
   , mapValue =
-      "61787b5ae0c69916aad12f2d7f00991c94e939634f77b7334c4a356f2ed604d3"
+      "373c28fd9ce59c07909c5122acf451d3805b3efd6c72ef32c9015c87374afaff"
   }
 , { mapKey = "mtl-compat"
   , mapValue =
@@ -1772,7 +1740,7 @@
   }
 , { mapKey = "natural-arithmetic"
   , mapValue =
-      "9dbbf80f89c1d76f7a423e5b69bd986bc69ae3fe861fc218bd994b03f65ad02f"
+      "b03e884523affe13bd8d3a2ecd8c1ece1947a7e103e570d7e3e94cfa56eb4913"
   }
 , { mapKey = "natural-transformation"
   , mapValue =
@@ -1780,15 +1748,15 @@
   }
 , { mapKey = "neat-interpolation"
   , mapValue =
-      "2ded55992e2c878782e24061054610e25c877772784a010b836a8a0d52b24c7b"
+      "a7682cda3eb3e04b70d0d1bf1bb00f1fd72023b20361037f726781c0aab91c4b"
   }
 , { mapKey = "net-mqtt"
   , mapValue =
-      "e433ec35c22c8f08b8a1a75959d0ee614582866fa2bde8f25c61ae9c796a5fa3"
+      "e79e5c7932d067e81a91a49f45bf75d07a78954ec45540ba3ede0cb23f2934a2"
   }
 , { mapKey = "network-conduit-tls"
   , mapValue =
-      "51363ab1feb41eafb1926e923a5b2204a4a111f53f35391d01f33a092b2bcda0"
+      "dfd60667a88357dd4fdf64908a5b3a5b2a0ae79990bef3e569b49b23b338deeb"
   }
 , { mapKey = "network-info"
   , mapValue =
@@ -1816,7 +1784,7 @@
   }
 , { mapKey = "nonempty-vector"
   , mapValue =
-      "822f451e1fbe976187a3b1c0202152b13c2869625f223d76b3bfa4d58806b92c"
+      "7226e5945d5aa53caa6f8d6cca958423245727c87a5fc5697844383babc2dd2f"
   }
 , { mapKey = "numeric-extras"
   , mapValue =
@@ -1856,11 +1824,11 @@
   }
 , { mapKey = "optics"
   , mapValue =
-      "90710928f0e5584605b8c85d2ece55d0496f65d8e66b34107a2adee3eb60ae44"
+      "bd4c57e7ee226c66c1a9b84cdb4d27b8ec5a9728fec14e68cab33f78f0276bcf"
   }
 , { mapKey = "optics-core"
   , mapValue =
-      "3c7e14b18935959b8910060c09cebc32ed30e1817c250d0e9dfd8f40305f9deb"
+      "3af8f7a24c759167f1dd9e6e21ea8709da3427cbbce67d9b9a780f7d3f3d3f45"
   }
 , { mapKey = "optics-extra"
   , mapValue =
@@ -1872,11 +1840,11 @@
   }
 , { mapKey = "options"
   , mapValue =
-      "20ae57ccc4e93b6ae2291d852baa40b74e2ad997766ed1999638080f3e7bfb5c"
+      "3b452de7e1b44d599d880842c9ecada6c06c438a1054453b981cbb23a9fa729e"
   }
 , { mapKey = "optparse-generic"
   , mapValue =
-      "2ee7a65428286a66edbb0fb8ceccc8139d183949f26d3c7d9e223c1dd54a30b9"
+      "4fdc65ca23615dc54b662d0bdef1bfe40deadcfe6e3c8190e2c91c369d971781"
   }
 , { mapKey = "optparse-simple"
   , mapValue =
@@ -1892,7 +1860,7 @@
   }
 , { mapKey = "pandoc"
   , mapValue =
-      "b74b52cd7ef891ea35e31073c109ceb6e914e3674d328287a1aba6c3422abedc"
+      "a16a72e2cf8fa6c62a03509a108f4f9ef06081c46052f9a027f28524e2c1c296"
   }
 , { mapKey = "pandoc-lua-marshal"
   , mapValue =
@@ -1900,7 +1868,7 @@
   }
 , { mapKey = "pandoc-types"
   , mapValue =
-      "55e059a2c5faafe7b63cd03fc804d8a5c30d59fe50828932ff4e8602245d706a"
+      "5b054a8db8b544984fbcc2b7be59f070750218131dd4609c1722ba0b398c008f"
   }
 , { mapKey = "parsec-numbers"
   , mapValue =
@@ -1948,19 +1916,19 @@
   }
 , { mapKey = "persistent"
   , mapValue =
-      "702d3dfc7c4c27eb88224c54b1cac4e3c2f26ff640157670260df4304394368e"
+      "ef86a2945c8221f606ec8ff6164b702044bf4f2f5c7c670814c8d6735ef31f0b"
   }
 , { mapKey = "persistent-postgresql"
   , mapValue =
-      "464ecac5080179b836f1cbf0cfe665e3f84e7cd176b6cf322704ec5f3c82a179"
+      "abdce2d6f27315f99f78d4cab38fe887b4174a73a7f6a7fea4c2d6e72f3fc4ed"
   }
 , { mapKey = "persistent-qq"
   , mapValue =
-      "7956d66b742d8fbc4a040760803b4fe4466f7e732a6bcf57fa627e7aec44f1da"
+      "18f3f837e1aec936f7bcdf27efc2eebfe2b422de1b85334ca68084c7335cd0c5"
   }
 , { mapKey = "persistent-sqlite"
   , mapValue =
-      "8c08aaf761dc28a825a603c3995d5ca1640086363146c62632602dc60794c6d5"
+      "0a0c2e976ec99009a5ca0cf8cb542110875e969daddf3143067b8d39b23ede38"
   }
 , { mapKey = "persistent-template"
   , mapValue =
@@ -1972,7 +1940,7 @@
   }
 , { mapKey = "pg-entity"
   , mapValue =
-      "5ea7c5220573da50f73403361f2e16422c405dc6cb86cb9853755e76a976a585"
+      "69c1c838c2129e39fd67c9b97681d39e844e9945fad46f7bc9a172c4a46d5d8a"
   }
 , { mapKey = "pg-transact"
   , mapValue =
@@ -2000,7 +1968,7 @@
   }
 , { mapKey = "polysemy"
   , mapValue =
-      "409c43ade1e19bd74bfd4cc17a43c27caed817381b60448e5f988d23ed86b3ef"
+      "692f4d32ae6cede65dde405f2788369f355268fca5ece17b1def3d9f8ab1bbc8"
   }
 , { mapKey = "polysemy-extra"
   , mapValue =
@@ -2020,7 +1988,7 @@
   }
 , { mapKey = "polysemy-plugin"
   , mapValue =
-      "0d0a6d1b52cad3ac9c271d379bec3dba282a88ad3bc42cfc2d6431afa0c4748e"
+      "b65bd6f58ac5048feffb1319313ae7d08debccb021049045397cd164183f8ecb"
   }
 , { mapKey = "polysemy-several"
   , mapValue =
@@ -2028,11 +1996,11 @@
   }
 , { mapKey = "polysemy-test"
   , mapValue =
-      "c856eb81eed000b138a8e30f4147d2910f2390bea8c8b29a4a2bceff505c56c5"
+      "f25866e7a879820e14d3b45f98ccb3511ce4ebb231203170a4b0aa2f3ad11c5c"
   }
 , { mapKey = "polysemy-time"
   , mapValue =
-      "e1c631202979d2dff8630c7ce770db8e1ee71414d7a3c49fe441b9fe4b7f693c"
+      "b4a33c8448df16051be725052ecdd0f0da72db0f988915efd67543578c5e9d9c"
   }
 , { mapKey = "polysemy-vinyl"
   , mapValue =
@@ -2040,7 +2008,7 @@
   }
 , { mapKey = "polysemy-zoo"
   , mapValue =
-      "b9d76db4394f047042da4241be91548e97e0bf9b917eaec52e685fa560a15060"
+      "f2cd2e6677f488d255039cd4aed822c7f16815a43d8c45707131c5d773539276"
   }
 , { mapKey = "poolboy"
   , mapValue =
@@ -2052,23 +2020,23 @@
   }
 , { mapKey = "postgres-options"
   , mapValue =
-      "6c933c650d29d124d42e6cf06de7452f448a50eaccc4e0fb6a71d8c443a61b9f"
+      "5a53652e1839832054107632ae5e83c17bd46696161c7f27d8e20a92de66aab5"
   }
 , { mapKey = "postgresql-binary"
   , mapValue =
-      "f72b466655600fefedbfc95b7d95359acf06fea0e6614d72e9d2d3294f25c67a"
+      "7301dc9edda451139c09412a32b7fb68a91699ee30f66e86a0d79e915b7d26a3"
   }
 , { mapKey = "postgresql-libpq"
   , mapValue =
-      "fb5b98161077394efc766528082c2b2d6b4c2314c3d4c62c4fe25aaf1de7a773"
+      "ba45b3e93488190c8066f4d485f53a93904b605d76fb520454869d84af34001b"
   }
 , { mapKey = "postgresql-migration"
   , mapValue =
-      "3bf2bb84a7cfb3eeafafacb824fd6c020965e67d73534c77b66499986c079bf4"
+      "89e06147b6863eb02a8717a3ca6b8a21691f19e8162d294864a010ea63247c83"
   }
 , { mapKey = "postgresql-simple"
   , mapValue =
-      "75f1772448368c4d849c53a87b9d8fd1a85aea1f8b099f29fbd07a9248b787a9"
+      "30b495f02068722141e4be230ed0074f783c0f58471e7aac3e56212e64d5b56e"
   }
 , { mapKey = "postgresql-simple-migration"
   , mapValue =
@@ -2080,7 +2048,7 @@
   }
 , { mapKey = "pqueue"
   , mapValue =
-      "ec14ad40754702507e00c6b0d1d52e9918a5c3c3ed49bb3f778ff8ff19478458"
+      "40fae12f825e1e00b1aab360021f6ce79ebd05793bbd728a40974c849b8bc36c"
   }
 , { mapKey = "pretty-relative-time"
   , mapValue =
@@ -2092,7 +2060,7 @@
   }
 , { mapKey = "primitive"
   , mapValue =
-      "ba39f1c62cbb84bb67699cd02f9fe714a956bbfc501449913fdad60d01d202be"
+      "74a96490e5377d3999176f20b4af5a6d1cdd3df18c0852ee82809e43ee950087"
   }
 , { mapKey = "primitive-addr"
   , mapValue =
@@ -2100,7 +2068,7 @@
   }
 , { mapKey = "primitive-extras"
   , mapValue =
-      "41dd380ccb65a46cd89a29c70244283d1e3b76888e836c78461d3550ad09dae9"
+      "abeef3e9f8092f729811eedaa0271fab3494cd488e9306b222aaba51eec2b36a"
   }
 , { mapKey = "primitive-offset"
   , mapValue =
@@ -2108,11 +2076,11 @@
   }
 , { mapKey = "primitive-unlifted"
   , mapValue =
-      "e6404ae02a37d802375eee876924f4b44265c7d12818a5691f9b955a85476f1d"
+      "edea5b7ed350e278fea61206fbd54ecf7e0df9a9d6759fb047da31dbc59f5496"
   }
 , { mapKey = "prometheus-client"
   , mapValue =
-      "8d3c0e13ae7a240d1b9111e86764addea8d1abdffe14e1c47055c7e484b6e7f2"
+      "801b60178efa11513e68a8601826483f81fdb78286f98b761add4ce0d31584da"
   }
 , { mapKey = "prometheus-metrics-ghc"
   , mapValue =
@@ -2124,7 +2092,7 @@
   }
 , { mapKey = "proteaaudio-sdl"
   , mapValue =
-      "ff2466667ce4d3fe3b2e4b4cd847de65d0f7ef4a66391c4ad11ec8a109de02ab"
+      "97704103d29d03537cb37126a35ac4d2722447ff9560b849ca4d649b9ceafff8"
   }
 , { mapKey = "protolude"
   , mapValue =
@@ -2146,6 +2114,10 @@
   , mapValue =
       "136724f2e8d35d6778925754e4e10ac551ddddd6c6b30d2dd97cabef1690aa7e"
   }
+, { mapKey = "quote-quot"
+  , mapValue =
+      "3d31428d96a36119523678de58ef3bb33ee7d1714966a811c8c09ee847270953"
+  }
 , { mapKey = "random-bytestring"
   , mapValue =
       "80bd478f992c38324ab59b480d3429a002f6dbeb804d6400979179345b5a5dd2"
@@ -2164,11 +2136,11 @@
   }
 , { mapKey = "rebase"
   , mapValue =
-      "102a38dcfe696b7a11251fdc5aa24df8405005d1c4f530087c21924fc7dba74c"
+      "f6f77216768b32b11a31144b71e000c6dd11cb5b7bedb86b3929fab87f98f1e8"
   }
 , { mapKey = "recursion-schemes"
   , mapValue =
-      "6c4c690308291e39e37f076f87a352568ba9f576a2a4d2b87ba870f6ae32c117"
+      "9c46cdc698c16afb3a6f5a64e254cc34dc1b6118fe6725faf677b455239b82d0"
   }
 , { mapKey = "ref-tf"
   , mapValue =
@@ -2182,6 +2154,10 @@
   , mapValue =
       "c7b887b37365ff14a65332ccc296fe3803faf32806a3dc24276178cd2c167814"
   }
+, { mapKey = "regex"
+  , mapValue =
+      "5c08ee1ff10f19624fa1ea5fb36eec0a248cf0c6254e21db3c1e1dda1f275703"
+  }
 , { mapKey = "regex-applicative"
   , mapValue =
       "aa16143b5dd292c38738d191e3cdaabebea3720285c4fd6e596cfd64c358d5f6"
@@ -2196,23 +2172,23 @@
   }
 , { mapKey = "relude"
   , mapValue =
-      "05817a9d53ab2291ef8dbc0488abee0e3ae224edab4527b5ac40513c6de2de54"
+      "656279ffd401af9a2ac223e8c293f47032134e9b54d005661af3c9e1e1e930db"
   }
 , { mapKey = "replace-megaparsec"
   , mapValue =
-      "58b2c50f7edcb4558fda2ba9f998fe02c8603162fa4dec33c4e1c52b24a894ea"
+      "414c48b87bf7033f390eebaa2baf6f5f5ca359e29e72ca86a1c818baf25b94b3"
   }
 , { mapKey = "req"
   , mapValue =
-      "d7b0091c81d1109198bdde4453f040b74433537496f0530c8b61b25922838f4d"
+      "f843f89ca9a24ab2f12dffaa220c41dc283a6138b0e50770c66cc176eb054429"
   }
 , { mapKey = "rerebase"
   , mapValue =
-      "3925810a6dca635d614b0bd3c76c17c0fda9faf605e130f3726bebcf2b55ae65"
+      "700a9b32eb7057570fb3ec2522206d57eb8e9947a7b0a88de0132fa1cfc551d0"
   }
 , { mapKey = "resolv"
   , mapValue =
-      "921668d8be49ec6404d99f34aafaa8c02b9bb7a2d5a8c95ad8c7188081adfb23"
+      "20098ad228325165acadbfebef19a3ec13bc007ce7cb6e4435f27745f73e7fab"
   }
 , { mapKey = "resource-pool"
   , mapValue =
@@ -2244,7 +2220,7 @@
   }
 , { mapKey = "sandwich"
   , mapValue =
-      "f4729c31ffb32e21e767798c92d5bd8b25c1cd3602b6a4d8b3806a06d7da3ad3"
+      "e91ee3bce08282fb5a434f0b531c4622f57cb90e00f66386bdd06b689c3929e2"
   }
 , { mapKey = "say"
   , mapValue =
@@ -2252,7 +2228,7 @@
   }
 , { mapKey = "scotty"
   , mapValue =
-      "02c63060f58c21a437dfe2ceb2c26461487f93dc2e0e2075d3967483a9be67d9"
+      "7e2bbea35c3d6d76f1256c9a5150092064a13cf2813a735297d838bde8ac619d"
   }
 , { mapKey = "sdl2"
   , mapValue =
@@ -2284,7 +2260,7 @@
   }
 , { mapKey = "servant"
   , mapValue =
-      "bb8c447f4903534bb4a90cdb77cdc7361c5e6a1f7630e906c1c032545842b076"
+      "db9b6ef5a8f14e982f3ba470bc6e91a347d18802fe2ebf5826ca07c4e980246b"
   }
 , { mapKey = "servant-auth"
   , mapValue =
@@ -2292,11 +2268,11 @@
   }
 , { mapKey = "servant-auth-client"
   , mapValue =
-      "153c676bf43ada75fd0db5c995e9ce08a68780faeda325fced593680c049c5e8"
+      "85f13b41040a1cf86c97ceabee3d91c77fc6cadc0b3d6a0bc353c66313e44de1"
   }
 , { mapKey = "servant-auth-server"
   , mapValue =
-      "2af16860ae0dcc0d3931c1645cedfbe80a5f47e7af26fb67cdaded64e0f467cd"
+      "2203300d4960b757bf7f7066d43def8278e2c3d60b0c642d7d88748c246f87d5"
   }
 , { mapKey = "servant-blaze"
   , mapValue =
@@ -2304,23 +2280,23 @@
   }
 , { mapKey = "servant-client"
   , mapValue =
-      "8f9aa26e13aeec3a8853ea6f4b89785fec282c16b9a995c3a83d4c0b5685cdc2"
+      "2068d5ac4ebe8f2b0128965975d48de561b1706c2097a8b42e6e955dc6167ed1"
   }
 , { mapKey = "servant-client-core"
   , mapValue =
-      "1f93393ae8acd8a8d87eec2418d60b858832ff898f33007bf5e0ba93e6305f17"
+      "4c118127e3339c6654d79076432ac1ff8e68766eb11117fa39fdcea549951a21"
   }
 , { mapKey = "servant-docs"
   , mapValue =
-      "b77f2b44c27f1d155cf494c4564736e086ee402c658b1a9bc12eba1ca5624b0c"
+      "ef868bc6741f4f92006aa99e6f8b3cbed1a580a44af615ca6be07e5b99a501b4"
   }
 , { mapKey = "servant-effectful"
   , mapValue =
-      "58140707fd9ceb9e782295aaf3dd9c324195a879059db1e5f3cd42ac2ac1c362"
+      "ab9bff633cb08f2510da16fa68895ee7282a471f9eff6d4ec91dfc401e41cd98"
   }
 , { mapKey = "servant-foreign"
   , mapValue =
-      "0626333ca45457d974a914a43f3191ebd4942c854b8871ce83419cd755afa6b9"
+      "fe1dc938eb9013e50a4b26e42e3750287b942cedb4fdea1cf6277045eca5a6d4"
   }
 , { mapKey = "servant-lucid"
   , mapValue =
@@ -2340,7 +2316,7 @@
   }
 , { mapKey = "servant-server"
   , mapValue =
-      "f50a44305ff4b9ed08ff659aa9b0862bb6b33bd90b333f9ff0f3461ea8f7c2e0"
+      "d38a8269876c034acee39c0bb903693998eaa6a798bb266f0deaf2b275f7072e"
   }
 , { mapKey = "servant-static-th"
   , mapValue =
@@ -2364,7 +2340,7 @@
   }
 , { mapKey = "shakespeare"
   , mapValue =
-      "c9b9b6b0adc25a4e16f7b4b793e3c5f0a6cede1897cae89eaa91fc3a9545231c"
+      "5f68beca2230652955d28b9da42697513d1acb9fe382e91b74febc6e4b110227"
   }
 , { mapKey = "shelly"
   , mapValue =
@@ -2372,7 +2348,7 @@
   }
 , { mapKey = "shh"
   , mapValue =
-      "0127f25a45c9627fdfe74e5b99a82f7ff5bc6a322219b9c0952b0cd09463a6b8"
+      "7dc6342f34ff48a700b195b9c23a81f05794754d9af541c88816f44f888937d4"
   }
 , { mapKey = "should-not-typecheck"
   , mapValue =
@@ -2392,15 +2368,15 @@
   }
 , { mapKey = "size-based"
   , mapValue =
-      "86270927c5b9ec1ff707ac50a4230138b84e1d530119a900bdaaba6726aff49f"
+      "44e64b2680c0bdaa50de8d58f144c9336013668cf0f2297cb5546f7fd9ce6296"
   }
 , { mapKey = "skylighting"
   , mapValue =
-      "0950217c59576591387b3c9723927eba63f45f3517188308036678c9bcecf4e7"
+      "d85f2378cb572546a9d89dc736505c4b96fb8096deefcd459d605dc6e1ed1f9b"
   }
 , { mapKey = "skylighting-core"
   , mapValue =
-      "ba56b3d6d32d86f42251ec3a2d5652fbcaffa7a482dd7c1ae5423b8983a0eaec"
+      "108aab7019d7e127bbc45a6e73edbf343e6fdd453bcea3078f97605bd0772ea7"
   }
 , { mapKey = "skylighting-format-ansi"
   , mapValue =
@@ -2408,7 +2384,7 @@
   }
 , { mapKey = "skylighting-format-blaze-html"
   , mapValue =
-      "51e06482cfc629a249e03812ba68f7893a74f29b4000842d8f9860461d602c2f"
+      "e679ba1b33990c463d14decffceb3b8152a0389c7c5b9aae5c232dbb665065ad"
   }
 , { mapKey = "skylighting-format-context"
   , mapValue =
@@ -2440,7 +2416,7 @@
   }
 , { mapKey = "sorted-list"
   , mapValue =
-      "7a75a8e8fa7063cd8f5b06c9f6e83b04c52c6e50408b84879359714998a1c500"
+      "ed81a3dbf1375f5e59dfbc163f14b76f1cd32def6de235b4097185abb3bf83ef"
   }
 , { mapKey = "souffle-haskell"
   , mapValue =
@@ -2456,7 +2432,7 @@
   }
 , { mapKey = "statistics"
   , mapValue =
-      "d4119984c814df27f0856785e5cf165d6b631d83fd0a47cbaea8373948aeb11a"
+      "6a32570b63ebc07c292debd6b7b3dbcaade9fa543106840bc12bef73fb3a3c65"
   }
 , { mapKey = "statistics-linreg"
   , mapValue =
@@ -2468,11 +2444,11 @@
   }
 , { mapKey = "stm-containers"
   , mapValue =
-      "653e4213b3cd21f84831f0419c41be01dbe5fb4a45fef81f2bef465205e91176"
+      "2ea216a48745777b593979855f586ea0986ee8ff344f3bb1beedde70a51abe3f"
   }
 , { mapKey = "stm-hamt"
   , mapValue =
-      "1af5ae4d00d0b7ef8403add8381aa79d4faff2d038d0d5958870933708662ca6"
+      "825a294de54b620f42669aba28ba3ee36802169876555ad549c9fc674bc580f8"
   }
 , { mapKey = "streaming"
   , mapValue =
@@ -2484,7 +2460,7 @@
   }
 , { mapKey = "streaming-bytestring"
   , mapValue =
-      "14c700e2b675375d2f616ca58fb00311b12dff981ce502e9751dfa3b82c3725f"
+      "41aa48f156833562216fb984b540d99e5b96f12ffde2920d5bf1cdb0f7deb503"
   }
 , { mapKey = "streamly"
   , mapValue =
@@ -2496,7 +2472,7 @@
   }
 , { mapKey = "strict-list"
   , mapValue =
-      "2a9f6798cea3663be23a5f749ee30e5509ef482b8c26cd991c56a6f3ee839b41"
+      "b552a810c07e2197fa11200fc30e07134016d9cdd650a3f93e3bf2e8bd51a4ef"
   }
 , { mapKey = "string-conv"
   , mapValue =
@@ -2552,7 +2528,7 @@
   }
 , { mapKey = "tasty-hspec"
   , mapValue =
-      "64d22784751f7d7baf8d92c53ac8c402831fdf101173912397f0fe6c42f83975"
+      "efe3d6254ecc74cb24a702c86d0ec350e92aafe38844a163e1ec14d110ce5d39"
   }
 , { mapKey = "tasty-lua"
   , mapValue =
@@ -2560,7 +2536,7 @@
   }
 , { mapKey = "tasty-rerun"
   , mapValue =
-      "0e88aabd8b8aac44c1470989218caf076ce95ba2d1cab950a3c189c6acbaa084"
+      "19bf179e1e6e3d3a67f3a3fff2a097df20506fde8b12c44ca80b69eeb5cd54e6"
   }
 , { mapKey = "tasty-wai"
   , mapValue =
@@ -2572,7 +2548,7 @@
   }
 , { mapKey = "template-haskell-compat-v0208"
   , mapValue =
-      "6f44dae0ce460c5d02e999e1a3131078f005a5be7c9ce266d7076f5c212d64f6"
+      "8e93fcbde7279e5123eb9250d6d2665c029bd2dc0cd370e8e8b8ca521741c665"
   }
 , { mapKey = "test-framework-smallcheck"
   , mapValue =
@@ -2588,19 +2564,23 @@
   }
 , { mapKey = "texmath"
   , mapValue =
-      "348d196f435086fef7419d6039cc3055515fdfe1a21faff5013e8c564578b951"
+      "b872beef8478af340e0c7e56ad5b8d51760c6e49b14585d9fb85e2468a540baf"
   }
 , { mapKey = "text-ansi"
   , mapValue =
-      "d123ce1900cf4a8749a4579047c1c65a39b38451eec7ae0793e38d29226d393a"
+      "55d6bd153138193c2d9c2535f822323c0f48b55ec4253f3cf73e2be8e468b420"
   }
 , { mapKey = "text-builder"
   , mapValue =
-      "4a1a3efdda869bce426e7190134ce71972ccb8f6d1aeffb14aa7bc784ca3ac1f"
+      "ad25473d69cb03d2da09286a265f8fc20f4f8d1c037307cf2c27374490686969"
   }
 , { mapKey = "text-builder-dev"
   , mapValue =
-      "3558b77f8300629628824d7c888f5a608491c1bf2ade074716ed3eb703034279"
+      "2e78750fb3024855f7d3196c91af84fca96e1f3d76dc52c87e4df58aea18ce21"
+  }
+, { mapKey = "text-builder-linear"
+  , mapValue =
+      "b1155db9c69a18a5d2a438e377c12e8fca6ba723384de7cacbb502e50185a1e3"
   }
 , { mapKey = "text-conversions"
   , mapValue =
@@ -2608,11 +2588,11 @@
   }
 , { mapKey = "text-display"
   , mapValue =
-      "3f1928d5198d264ab6a9ec16af4908706430df81422b56ca7e525610ff7d4af3"
+      "f99a9cbb2cbe727403656251f84ad225494095f5cceb6884fb1ab8e26a0e2b98"
   }
 , { mapKey = "text-icu"
   , mapValue =
-      "0efa47092a230a4dc1cabef658dafbcb069d3a0c37a6b723ef5fb9a72b1a6d5a"
+      "fcde251f0eab120ef5adbb2f9b17cc2b9c58392393f7764a41f7d93824ae8cb6"
   }
 , { mapKey = "text-latin1"
   , mapValue =
@@ -2628,7 +2608,7 @@
   }
 , { mapKey = "th-desugar"
   , mapValue =
-      "9ebe768179dd8acb0b6396e09953693015c218d9f2f00d6b3da408ace79d1370"
+      "56bd6a4050ec9498df97a05c0eb33316624abf5066e09018ab5dce6ad27bee3e"
   }
 , { mapKey = "th-env"
   , mapValue =
@@ -2644,7 +2624,7 @@
   }
 , { mapKey = "threads"
   , mapValue =
-      "dc94da5e21b21fa2689a23cd2d396c3adf224615e654e873ac341baaf5188fa3"
+      "b5ebffd58156d48d6776b5fc889349df079056033acceef1d0b6afdf134e7dbd"
   }
 , { mapKey = "tidal"
   , mapValue =
@@ -2672,7 +2652,11 @@
   }
 , { mapKey = "tmp-postgres"
   , mapValue =
-      "c884424893d5c1f98cc17645ea3151ea1afdb3d54ed4b3005a42fe67c6cf8d2a"
+      "7af98662fcbad02f409b568a7ed084511011fc3834c52b9db9012bd66f045e7f"
+  }
+, { mapKey = "toml-parser"
+  , mapValue =
+      "218a2cde07a660f91b8710f6d46f909ffb47cb751226766346b731cbaa475e99"
   }
 , { mapKey = "torsor"
   , mapValue =
@@ -2680,7 +2664,7 @@
   }
 , { mapKey = "transformers-except"
   , mapValue =
-      "36ab4bb13d144ef5fb7a1ab8758de9c5d173bfe35c2e02b25d78f859169e6445"
+      "565ec9875ff06312abead55fe9f7d7df246e1e53521a9eb45dddfc13f33a9bdf"
   }
 , { mapKey = "tuple"
   , mapValue =
@@ -2702,6 +2686,14 @@
   , mapValue =
       "fa3e5c9455c12d0d41c359b25d40ef4b574cdcb6328b04763c8dfe6e7cbd7c1c"
   }
+, { mapKey = "typst"
+  , mapValue =
+      "0f1594654c69dd83be319b99d01aa6c1b7e10de98f410714d18b1864d831c418"
+  }
+, { mapKey = "typst-symbols"
+  , mapValue =
+      "ae9ebbfac2a45889fd362bd85c588e442180ea1182b25e578edba9375ae1bfe2"
+  }
 , { mapKey = "uglymemo"
   , mapValue =
       "4860be15fb8c0b1079fe2969c6ce12b3dadf28c176808af98ebefb15b92a093f"
@@ -2712,7 +2704,7 @@
   }
 , { mapKey = "unicode-collation"
   , mapValue =
-      "3686db3bc8dc4a60de2c4cc05c607208efab66aed243169186661ce94c168661"
+      "c2994cd351d01adf77a768802a414d977ea30ca13cc33651138e2d82b69a30a9"
   }
 , { mapKey = "unicode-data"
   , mapValue =
@@ -2748,7 +2740,7 @@
   }
 , { mapKey = "validation"
   , mapValue =
-      "8062d2b486bf263bf13bfe0345025a167412befcb51faae1b9167c4a6e304e43"
+      "0590d538dbf936d70f6971ac240c227776cc662c36b479a73234cb55163dcb76"
   }
 , { mapKey = "validation-selective"
   , mapValue =
@@ -2802,9 +2794,17 @@
   , mapValue =
       "dd4bcb799d93c6e44ee9b7dce93c682d6312b856affa9b1cca2f348e9e230ed2"
   }
+, { mapKey = "vty-crossplatform"
+  , mapValue =
+      "31c0e8d3a3b9411a551d0038d52a0a41ddbc082b1132eb6031c9516f51aa9619"
+  }
+, { mapKey = "vty-unix"
+  , mapValue =
+      "da0d7aae4726aea29dde97411be6d3c6dfc407fc3e01773ac0a6e47d54d8bd34"
+  }
 , { mapKey = "wai-app-static"
   , mapValue =
-      "924788800a1bccb4f979aa1fb12ddddae3e6aebbba4227abc784386137c258ed"
+      "af9cc888ccff542932bb4e6be08b49b89f38c922c1566644207ec8228920cbbb"
   }
 , { mapKey = "wai-extra"
   , mapValue =
@@ -2832,11 +2832,11 @@
   }
 , { mapKey = "warp"
   , mapValue =
-      "1f1e87d5d99e249b46de7b4093e053d67c16baee9b1e4c7824c306843bdc866f"
+      "86348a5b9acc369fba178752444bf06ac028f806108c1fe03088818205159570"
   }
 , { mapKey = "warp-tls"
   , mapValue =
-      "8315f554f3f295a32dd2c8fbc3b899297a9be85d6444ceb78479d94051f9d7c6"
+      "224e227aef36de8850c106ce21f141ca00896998f7f1a46cdf31d60039c50447"
   }
 , { mapKey = "websockets"
   , mapValue =
@@ -2844,7 +2844,7 @@
   }
 , { mapKey = "wide-word"
   , mapValue =
-      "44042fc28ece788110b978749f42f8ef1dff829a6edb792457f731ab0ae21e63"
+      "b178248009f6bb60fdc4c64af2f5a791c48492efca22b2a67e24abd6e93678b4"
   }
 , { mapKey = "with-utf8"
   , mapValue =
@@ -2860,19 +2860,19 @@
   }
 , { mapKey = "wreq"
   , mapValue =
-      "b402e2198ee37ac290878e2449a81c9cc01e46b36b563fc337693f823b6b3898"
+      "36ede96bc2d35689eafc3d4a75322f4b7f31f9e1e6599bf0fbdcbfd27ec48e2b"
   }
 , { mapKey = "wuss"
   , mapValue =
-      "278643233c642d80d5da4befe8aa449f0d683bea1a245b2ec6e5b1ec4cbde13e"
+      "02b01824c01368d39851de5567b2fa127dba5357cd5706996946e822b0f8e5ca"
   }
 , { mapKey = "xml-conduit"
   , mapValue =
-      "5c5e95094a75ebaff6b7e0fb8fdaea934df2f2d1792acfad3494a4eedc7f69b3"
+      "a4d79f2ac7e7cf41851bf79c872e186ac7aee2309aef2ea2da70f0f50a1fce4e"
   }
 , { mapKey = "xml-conduit-writer"
   , mapValue =
-      "1bc982dfe32723d4f514e3b537d7894275b7a7925fdabe3521459da99f06a321"
+      "1170b8fbc5fb98303363af2309b71aac2e0fe2299fcf600960d1d826f6756fd4"
   }
 , { mapKey = "xml-types"
   , mapValue =
diff --git a/overlay.nix b/overlay.nix
index 483ecf39c08053a2bcc9d4c6943b200176ce35df..7392ebe3a2127f98c6767a3075a3ed66d331a00a 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -63,6 +63,8 @@ final: prev: with pkgs.haskell.lib; {
 
   active = final.callPackage (./pkgs/active.nix) { };
 
+  aeson = final.callPackage (./pkgs/aeson.nix) { };
+
   aeson-qq = final.callPackage (./pkgs/aeson-qq.nix) { };
 
   aeson-yaml = final.callPackage (./pkgs/aeson-yaml.nix) { };
@@ -83,6 +85,8 @@ final: prev: with pkgs.haskell.lib; {
 
   async-timer = final.callPackage (./pkgs/async-timer.nix) { };
 
+  attoparsec-aeson = final.callPackage (./pkgs/attoparsec-aeson.nix) { };
+
   attoparsec-binary = final.callPackage (./pkgs/attoparsec-binary.nix) { };
 
   attoparsec-iso8601 = final.callPackage (./pkgs/attoparsec-iso8601.nix) { };
@@ -137,10 +141,6 @@ final: prev: with pkgs.haskell.lib; {
 
   c2hs = final.callPackage (./pkgs/c2hs.nix) { };
 
-  cabal-install = final.callPackage (./pkgs/cabal-install.nix) { };
-
-  cabal-install-solver = final.callPackage (./pkgs/cabal-install-solver.nix) { };
-
   cache = final.callPackage (./pkgs/cache.nix) { };
 
   canonical-json = final.callPackage (./pkgs/canonical-json.nix) { };
@@ -281,10 +281,6 @@ final: prev: with pkgs.haskell.lib; {
 
   dhall-docs = final.callPackage (./pkgs/dhall-docs.nix) { };
 
-  dhall-json = final.callPackage (./pkgs/dhall-json.nix) { };
-
-  dhall-nixpkgs = final.callPackage (./pkgs/dhall-nixpkgs.nix) { };
-
   diagrams-contrib = final.callPackage (./pkgs/diagrams-contrib.nix) { };
 
   diagrams-core = final.callPackage (./pkgs/diagrams-core.nix) { };
@@ -301,6 +297,8 @@ final: prev: with pkgs.haskell.lib; {
 
   digest = final.callPackage (./pkgs/digest.nix) { };
 
+  digits = final.callPackage (./pkgs/digits.nix) { };
+
   dimensional = final.callPackage (./pkgs/dimensional.nix) { };
 
   direct-sqlite = final.callPackage (./pkgs/direct-sqlite.nix) { };
@@ -347,8 +345,6 @@ final: prev: with pkgs.haskell.lib; {
 
   ekg-wai = final.callPackage (./pkgs/ekg-wai.nix) { };
 
-  ema = final.callPackage (./pkgs/ema.nix) { };
-
   email-validate = final.callPackage (./pkgs/email-validate.nix) { };
 
   emojis = final.callPackage (./pkgs/emojis.nix) { };
@@ -373,8 +369,6 @@ final: prev: with pkgs.haskell.lib; {
 
   fcf-containers = final.callPackage (./pkgs/fcf-containers.nix) { };
 
-  feedback = final.callPackage (./pkgs/feedback.nix) { };
-
   file-embed = final.callPackage (./pkgs/file-embed.nix) { };
 
   filelock = final.callPackage (./pkgs/filelock.nix) { };
@@ -587,8 +581,6 @@ final: prev: with pkgs.haskell.lib; {
 
   hls-explicit-record-fields-plugin = final.callPackage (./pkgs/hls-explicit-record-fields-plugin.nix) { };
 
-  hls-fourmolu-plugin = final.callPackage (./pkgs/hls-fourmolu-plugin.nix) { };
-
   hls-gadt-plugin = final.callPackage (./pkgs/hls-gadt-plugin.nix) { };
 
   hls-graph = final.callPackage (./pkgs/hls-graph.nix) { };
@@ -607,8 +599,6 @@ final: prev: with pkgs.haskell.lib; {
 
   hls-refactor-plugin = final.callPackage (./pkgs/hls-refactor-plugin.nix) { };
 
-  hls-refine-imports-plugin = final.callPackage (./pkgs/hls-refine-imports-plugin.nix) { };
-
   hls-retrie-plugin = final.callPackage (./pkgs/hls-retrie-plugin.nix) { };
 
   hls-splice-plugin = final.callPackage (./pkgs/hls-splice-plugin.nix) { };
@@ -625,8 +615,6 @@ final: prev: with pkgs.haskell.lib; {
 
   hp2pretty = final.callPackage (./pkgs/hp2pretty.nix) { };
 
-  hpack-dhall = final.callPackage (./pkgs/hpack-dhall.nix) { };
-
   hslogger = final.callPackage (./pkgs/hslogger.nix) { };
 
   hslua = final.callPackage (./pkgs/hslua.nix) { };
@@ -851,8 +839,6 @@ final: prev: with pkgs.haskell.lib; {
 
   mime-mail = final.callPackage (./pkgs/mime-mail.nix) { };
 
-  minio-hs = final.callPackage (./pkgs/minio-hs.nix) { };
-
   mmark = final.callPackage (./pkgs/mmark.nix) { };
 
   mod = final.callPackage (./pkgs/mod.nix) { };
@@ -861,8 +847,6 @@ final: prev: with pkgs.haskell.lib; {
 
   monad-logger = final.callPackage (./pkgs/monad-logger.nix) { };
 
-  monad-logger-extras = final.callPackage (./pkgs/monad-logger-extras.nix) { };
-
   monad-loops = final.callPackage (./pkgs/monad-loops.nix) { };
 
   monad-primitive = final.callPackage (./pkgs/monad-primitive.nix) { };
@@ -1075,6 +1059,8 @@ final: prev: with pkgs.haskell.lib; {
 
   quiet = final.callPackage (./pkgs/quiet.nix) { };
 
+  quote-quot = final.callPackage (./pkgs/quote-quot.nix) { };
+
   random-bytestring = final.callPackage (./pkgs/random-bytestring.nix) { };
 
   random-fu = final.callPackage (./pkgs/random-fu.nix) { };
@@ -1093,6 +1079,8 @@ final: prev: with pkgs.haskell.lib; {
 
   refined = final.callPackage (./pkgs/refined.nix) { };
 
+  regex = final.callPackage (./pkgs/regex.nix) { };
+
   regex-applicative = final.callPackage (./pkgs/regex-applicative.nix) { };
 
   regex-compat = final.callPackage (./pkgs/regex-compat.nix) { };
@@ -1303,6 +1291,8 @@ final: prev: with pkgs.haskell.lib; {
 
   text-builder-dev = final.callPackage (./pkgs/text-builder-dev.nix) { };
 
+  text-builder-linear = final.callPackage (./pkgs/text-builder-linear.nix) { };
+
   text-conversions = final.callPackage (./pkgs/text-conversions.nix) { };
 
   text-display = final.callPackage (./pkgs/text-display.nix) { };
@@ -1339,6 +1329,8 @@ final: prev: with pkgs.haskell.lib; {
 
   tmp-postgres = final.callPackage (./pkgs/tmp-postgres.nix) { };
 
+  toml-parser = final.callPackage (./pkgs/toml-parser.nix) { };
+
   torsor = final.callPackage (./pkgs/torsor.nix) { };
 
   transformers-except = final.callPackage (./pkgs/transformers-except.nix) { };
@@ -1353,6 +1345,10 @@ final: prev: with pkgs.haskell.lib; {
 
   typerep-map = final.callPackage (./pkgs/typerep-map.nix) { };
 
+  typst = final.callPackage (./pkgs/typst.nix) { };
+
+  typst-symbols = final.callPackage (./pkgs/typst-symbols.nix) { };
+
   uglymemo = final.callPackage (./pkgs/uglymemo.nix) { };
 
   unagi-chan = final.callPackage (./pkgs/unagi-chan.nix) { };
@@ -1403,6 +1399,10 @@ final: prev: with pkgs.haskell.lib; {
 
   vinyl = final.callPackage (./pkgs/vinyl.nix) { };
 
+  vty-crossplatform = final.callPackage (./pkgs/vty-crossplatform.nix) { };
+
+  vty-unix = final.callPackage (./pkgs/vty-unix.nix) { };
+
   wai-app-static = final.callPackage (./pkgs/wai-app-static.nix) { };
 
   wai-extra = final.callPackage (./pkgs/wai-extra.nix) { };
diff --git a/pkgs/BNFC.nix b/pkgs/BNFC.nix
index 7fc7926ed58b31ad7cde62e7a25b4c0c1c75acad..78e42d2e479821bbfbcd92f8b305f2a4c32b2178 100644
--- a/pkgs/BNFC.nix
+++ b/pkgs/BNFC.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "BNFC";
-  version = "2.9.4.1";
-  sha256 = "5e93609c1633e4b6636d0ac2b52c1d35228c13bd704a7849cb4e92b00ce27250";
+  version = "2.9.5";
+  sha256 = "fa35e9a2a2bd12c3680482a350f57963807ccc9e964a206cb09e5b1a4d02576b";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -27,7 +27,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://bnfc.digitalgrammars.com/";
+  homepage = "https://bnfc.digitalgrammars.com/";
   description = "A compiler front-end generator";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/Cabal-QuickCheck.nix b/pkgs/Cabal-QuickCheck.nix
deleted file mode 100644
index e644061234628ff5003f0861e123045ac5c652c0..0000000000000000000000000000000000000000
--- a/pkgs/Cabal-QuickCheck.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, Cabal, Cabal-syntax, QuickCheck, base, bytestring
-, fetchgit, lib
-}:
-mkDerivation {
-  pname = "Cabal-QuickCheck";
-  version = "3.10.1.0";
-  src = fetchgit {
-    url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
-    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/Cabal-QuickCheck/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring Cabal Cabal-syntax QuickCheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "QuickCheck instances for types in Cabal";
-  license = "unknown";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Cabal-described.nix b/pkgs/Cabal-described.nix
deleted file mode 100644
index b9b56aaf2cdc7aec7e03e2925ea2a812a106465f..0000000000000000000000000000000000000000
--- a/pkgs/Cabal-described.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, Cabal, Cabal-syntax, QuickCheck, base, containers
-, fetchgit, lib, pretty, rere, tasty, tasty-quickcheck
-, transformers
-}:
-mkDerivation {
-  pname = "Cabal-described";
-  version = "3.10.1.0";
-  src = fetchgit {
-    url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
-    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/Cabal-described/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base Cabal Cabal-syntax containers pretty QuickCheck rere tasty
-    tasty-quickcheck transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Described functionality for types in Cabal";
-  license = "unknown";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Cabal-syntax.nix b/pkgs/Cabal-syntax.nix
deleted file mode 100644
index 2f03fbcdc824a06f746220d30f5e5861e56d2237..0000000000000000000000000000000000000000
--- a/pkgs/Cabal-syntax.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, array, base, binary, bytestring, containers
-, deepseq, directory, filepath, lib, mtl, parsec, pretty, text
-, time, transformers, unix
-}:
-mkDerivation {
-  pname = "Cabal-syntax";
-  version = "3.10.1.0";
-  sha256 = "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base binary bytestring containers deepseq directory filepath
-    mtl parsec pretty text time transformers unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "A library for working with .cabal files";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Cabal-tree-diff.nix b/pkgs/Cabal-tree-diff.nix
deleted file mode 100644
index 49514f7ee5fc597aa5a0386fb52679b8025dfe58..0000000000000000000000000000000000000000
--- a/pkgs/Cabal-tree-diff.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, Cabal, Cabal-syntax, base, fetchgit, lib, tree-diff
-}:
-mkDerivation {
-  pname = "Cabal-tree-diff";
-  version = "3.10.1.0";
-  src = fetchgit {
-    url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
-    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/Cabal-tree-diff/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base Cabal Cabal-syntax tree-diff ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "QuickCheck instances for types in Cabal";
-  license = "unknown";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Cabal.nix b/pkgs/Cabal.nix
deleted file mode 100644
index 1ea0f4a35a9e5f4bfcdc2975fd0818bc8dfd7add..0000000000000000000000000000000000000000
--- a/pkgs/Cabal.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, Cabal-syntax, array, base, bytestring, containers
-, deepseq, directory, filepath, lib, mtl, parsec, pretty, process
-, text, time, transformers, unix
-}:
-mkDerivation {
-  pname = "Cabal";
-  version = "3.10.1.0";
-  sha256 = "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ mtl parsec ];
-  libraryHaskellDepends = [
-    array base bytestring Cabal-syntax containers deepseq directory
-    filepath mtl parsec pretty process text time transformers unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "A framework for packaging Haskell software";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Chart-diagrams.nix b/pkgs/Chart-diagrams.nix
index c4363a4cc8a63ee6cd663ed288c54f94c40383fa..0e48975462e39dc428d1b1818a36ef4a22709e8e 100644
--- a/pkgs/Chart-diagrams.nix
+++ b/pkgs/Chart-diagrams.nix
@@ -5,10 +5,8 @@
 }:
 mkDerivation {
   pname = "Chart-diagrams";
-  version = "1.9.4";
-  sha256 = "a89cb7aee51fc64276923b879b7bc66fafd994130f53a3035ff6feaf9daf7366";
-  revision = "1";
-  editedCabalFile = "11q3hx4fprmkjp0v4m2c2fzvwqym5aa9wv2lbbr6vxq0wnigp7zz";
+  version = "1.9.5.1";
+  sha256 = "f8dcd91926e6f46b47a21a131650f1dc026e410a63f276ff52ba092aab7662de";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/Chart.nix b/pkgs/Chart.nix
index b1a44ef982c15c0270b3512d4e28f14d921bbba9..0a7815416f7685e290cc720db1f18295ee9da06a 100644
--- a/pkgs/Chart.nix
+++ b/pkgs/Chart.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "Chart";
-  version = "1.9.4";
-  sha256 = "35068f14d9100f3156b9d2cd86b928a20ec832f596412203ee65e814888d9d7a";
-  revision = "1";
-  editedCabalFile = "0l9irzb4zq5jhgl1rvwgxz6rrzxjndj4arjv7adlzs5zl43iazqr";
+  version = "1.9.5";
+  sha256 = "0c1e2fb865093eb9456d5b05a4974abcba149c96d83678b39ddb949b9e6adf5b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ChasingBottoms.nix b/pkgs/ChasingBottoms.nix
deleted file mode 100644
index 087d77dbaf01710568659e627bc9990561000f09..0000000000000000000000000000000000000000
--- a/pkgs/ChasingBottoms.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, containers, lib, mtl
-, random, syb
-}:
-mkDerivation {
-  pname = "ChasingBottoms";
-  version = "1.3.1.12";
-  sha256 = "a018538c0196390c7ebb5c677ff5b81bd760d75ae2b21bae8ab8a47b00f6c9ef";
-  revision = "1";
-  editedCabalFile = "0ra041bg2m04niqzi0y468cfmv2bkjh8ckix2i8xf2shw7v2zn4r";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers mtl QuickCheck random syb
-  ];
-  testHaskellDepends = [
-    array base containers mtl QuickCheck random syb
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "For testing partial and infinite values";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Diff.nix b/pkgs/Diff.nix
deleted file mode 100644
index c7e4d173caa9893e1fe6a5de5d73bad5056d0b37..0000000000000000000000000000000000000000
--- a/pkgs/Diff.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, directory, lib, pretty
-, process, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "Diff";
-  version = "0.4.1";
-  sha256 = "fd5e4aaac7219bcbb14834fb8580ebe0aae905958d0ad74f5338ea290b372670";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base pretty ];
-  testHaskellDepends = [
-    array base directory pretty process QuickCheck test-framework
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "O(ND) diff algorithm in haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Glob.nix b/pkgs/Glob.nix
deleted file mode 100644
index 6f3ef6f6d1c0248018e9bb0c232a5bbfc805ef27..0000000000000000000000000000000000000000
--- a/pkgs/Glob.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, containers, directory
-, dlist, filepath, lib, test-framework, test-framework-hunit
-, test-framework-quickcheck2, transformers, transformers-compat
-}:
-mkDerivation {
-  pname = "Glob";
-  version = "0.10.2";
-  sha256 = "6af672ac8427d35cbd42d64142dc288feab266f0be92dae3c696e8860d8173c0";
-  revision = "3";
-  editedCabalFile = "1080rd5073g87rfm5whimb72b75105lqanybrbsfi14gmvndnbfx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers directory dlist filepath transformers
-    transformers-compat
-  ];
-  testHaskellDepends = [
-    base containers directory dlist filepath HUnit QuickCheck
-    test-framework test-framework-hunit test-framework-quickcheck2
-    transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://iki.fi/matti.niemenmaa/glob/";
-  description = "Globbing library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/HTTP.nix b/pkgs/HTTP.nix
index 9b2acc570542a1eb5b7f71914b40c6163826d9ef..49a9a687d60525065bcebbc2b4d7fadab107f1a3 100644
--- a/pkgs/HTTP.nix
+++ b/pkgs/HTTP.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "HTTP";
   version = "4000.4.1";
   sha256 = "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453";
-  revision = "2";
-  editedCabalFile = "1bpq8xjyrgcxs6yf6wh7ada2xrln1dqi02b5ilj8gwn1p30hq8nr";
+  revision = "3";
+  editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/HaskellNet.nix b/pkgs/HaskellNet.nix
index 64024e88218f03585af44adce11f4a64fb4e87f0..621c13a1453585c89f9fbe9174e6ef98cc521a66 100644
--- a/pkgs/HaskellNet.nix
+++ b/pkgs/HaskellNet.nix
@@ -3,8 +3,10 @@
 }:
 mkDerivation {
   pname = "HaskellNet";
-  version = "0.6.0.2";
-  sha256 = "f22a47152a02c3b54ed59c812d40ff703f2e94657b57071372d9716c20c30d53";
+  version = "0.6.1.2";
+  sha256 = "658bd4a6e91b1b7aa0c092e238fa55b37c9e2c139fba33f6346b2b9798b1a079";
+  revision = "1";
+  editedCabalFile = "1j5g09v40rvsk4crfjabs0mma5nlwsbzbny25803bc6805jh9058";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/HsOpenSSL.nix b/pkgs/HsOpenSSL.nix
index 8c76f2c9856c57235b797f8c1521c0e65ec7ac82..8d17ee9db214334a6d701507f5ba0f09e31bfb9e 100644
--- a/pkgs/HsOpenSSL.nix
+++ b/pkgs/HsOpenSSL.nix
@@ -3,8 +3,10 @@
 }:
 mkDerivation {
   pname = "HsOpenSSL";
-  version = "0.11.7.5";
-  sha256 = "e1f85ebe2ac9207414f2ad0b1c7c972f336e8f15ca182e42a5886909962d1478";
+  version = "0.11.7.6";
+  sha256 = "662de291bb4aaac1183b0e4e15345cc1f40e64f293f2ba9513f441ec1cf4c7a2";
+  revision = "1";
+  editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/HsYAML.nix b/pkgs/HsYAML.nix
index ce7182a6c6288e51e4f61494a5421344e06ff198..48f64f1d4ae7b8d0a4ea7a9b9689295d632de3d4 100644
--- a/pkgs/HsYAML.nix
+++ b/pkgs/HsYAML.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "HsYAML";
-  version = "0.2.1.1";
-  sha256 = "465bb4fc90979c19bedf6db2053f9ac54537b4912d5827d7e2135d42ef5ef628";
-  revision = "2";
-  editedCabalFile = "0r2yh96nhmlfy2vj2c7i5703brv4lp9cw5v044j7s8487jvv70d6";
+  version = "0.2.1.3";
+  sha256 = "e026a9ac5b8fd81436ddc5fe9e0522eeeeba81a44f152c7378d05913778f9d90";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ListLike.nix b/pkgs/ListLike.nix
index 2b682a41991dbba40ad7418c4464d062c9762c20..84a5ce220292923363b1bf9d641a0c74d67d6bf2 100644
--- a/pkgs/ListLike.nix
+++ b/pkgs/ListLike.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "ListLike";
-  version = "4.7.8";
-  sha256 = "9a7929f29011e5647b39b8d6ef1cadf76a6ada19b747eabec5fdc077bc7437d1";
+  version = "4.7.8.2";
+  sha256 = "ad637af1a0241934e33e6b43ad5b3f1c4a96f84be392a7aa6066f989d1aff9d4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/MemoTrie.nix b/pkgs/MemoTrie.nix
index a3d57c454eb376930e7ae05aed7df969701a9651..166d54ee7ec4488fc2828928283455d56bf40db0 100644
--- a/pkgs/MemoTrie.nix
+++ b/pkgs/MemoTrie.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, newtype-generics }:
 mkDerivation {
   pname = "MemoTrie";
-  version = "0.6.10";
-  sha256 = "584df0e138093b2f2edc893a69883eb8cbca3402ebdc75392a7742e86156ba53";
+  version = "0.6.11";
+  sha256 = "f7a6abf136eac1c6b370678e14e9519ed88c0c2adf75f06d6855b464db0c2420";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/MonadRandom.nix b/pkgs/MonadRandom.nix
deleted file mode 100644
index 4a4b52227addda61dcd56ffb7fd944a3ede54aa8..0000000000000000000000000000000000000000
--- a/pkgs/MonadRandom.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, lib, mtl, primitive, random, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "MonadRandom";
-  version = "0.6";
-  sha256 = "c9388630895c3e68035ab804004de852b63a95d083aa140dc0e1481c854ed044";
-  revision = "3";
-  editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base mtl primitive random transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Random-number generation monad";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/OneTuple.nix b/pkgs/OneTuple.nix
deleted file mode 100644
index 626fc7d7d18af7af0d1ec0e1f6eff73c10d28529..0000000000000000000000000000000000000000
--- a/pkgs/OneTuple.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, foldable1-classes-compat, ghc-prim, hashable
-, lib, template-haskell
-}:
-mkDerivation {
-  pname = "OneTuple";
-  version = "0.4.1.1";
-  sha256 = "c9e764d4ee1e57cad8341bd5d0de33ba3a52b6793fc1309679f2bf60c030bb2b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim template-haskell ];
-  testHaskellDepends = [
-    base foldable1-classes-compat hashable template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Singleton Tuple";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/Only.nix b/pkgs/Only.nix
index 564ca6f66e07f24942e0e69e2165eeeabf93e62e..72002751c7fcfe708a4868c0bbd8cc88f1fb23bc 100644
--- a/pkgs/Only.nix
+++ b/pkgs/Only.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "Only";
   version = "0.1";
   sha256 = "ab7aa193e8c257d3bda6b0b3c1cbcf74cdaa85ab08cb20c2dd62ba248c1ab265";
-  revision = "1";
-  editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
+  revision = "2";
+  editedCabalFile = "01rvhsm4gyvjpgakrj7nzlfb1bjhkkx87xj3hng2x00g3qc3s0y6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/PSQueue.nix b/pkgs/PSQueue.nix
index 15eade7ccb2e4d0ec57b4070f7fd8a59f86ecbad..bfb9e64f70877158a6258bc43e09da04fc953b19 100644
--- a/pkgs/PSQueue.nix
+++ b/pkgs/PSQueue.nix
@@ -1,10 +1,10 @@
 { mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
   pname = "PSQueue";
-  version = "1.1.1";
-  sha256 = "7191ef25e63df3658ad3eccde7d7a7e31fa8dd43c6705714672836dbf9c7ef0a";
+  version = "1.2.0";
+  sha256 = "39003847be7f302a7059b4e103739677f3b205f2d41e63557acc40f9cc577be6";
   revision = "1";
-  editedCabalFile = "02a5g59sc9jh3v4pibhjpijv8lsbiydznrpqyin7qhwsyc0p813a";
+  editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/PyF.nix b/pkgs/PyF.nix
index 9e5086b68b7dee3191cdb1a4523cd0c3877a809b..f768476b303d812892e19bb425a3f04aa0b2f29c 100644
--- a/pkgs/PyF.nix
+++ b/pkgs/PyF.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "PyF";
-  version = "0.11.1.1";
-  sha256 = "f3607099f3357bce93bf1b3034c702b833d1114966b922267136340f262d3324";
+  version = "0.11.2.1";
+  sha256 = "e865c45a9323fc60f0a35f0aedf9e9f5c12258a6344bbd49031c09211b82220a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/QuickCheck.nix b/pkgs/QuickCheck.nix
index d83e375dcbd231508d7f67d9d2029c174318f45e..c085043d6d4ebea395224afbe96ec1a686fa4cdb 100644
--- a/pkgs/QuickCheck.nix
+++ b/pkgs/QuickCheck.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "QuickCheck";
-  version = "2.14.2";
-  sha256 = "d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3";
+  version = "2.14.3";
+  sha256 = "5c0f22b36b28a1a8fa110b3819818d3f29494a3b0dedbae299f064123ca70501";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/SHA.nix b/pkgs/SHA.nix
deleted file mode 100644
index b535a0492dced50e114e29d945ecc7f8e6d9ff3b..0000000000000000000000000000000000000000
--- a/pkgs/SHA.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, binary, bytestring, lib
-, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "SHA";
-  version = "1.6.4.4";
-  sha256 = "6bd950df6b11a3998bb1452d875d2da043ee43385459afc5f16d471d25178b44";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base binary bytestring ];
-  testHaskellDepends = [
-    array base binary bytestring QuickCheck test-framework
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Implementations of the SHA suite of message digest functions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/StateVar.nix b/pkgs/StateVar.nix
deleted file mode 100644
index 21200a0247164c7ca4ec7e26b8f43fc6becbf8db..0000000000000000000000000000000000000000
--- a/pkgs/StateVar.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, stm, transformers }:
-mkDerivation {
-  pname = "StateVar";
-  version = "1.2.2";
-  sha256 = "5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base stm transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-opengl/StateVar";
-  description = "State variables";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/abstract-deque.nix b/pkgs/abstract-deque.nix
deleted file mode 100644
index bcb3e0807e0e0a56b1aeb2fa82b92fd41b37856c..0000000000000000000000000000000000000000
--- a/pkgs/abstract-deque.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, array, base, containers, lib, random, time }:
-mkDerivation {
-  pname = "abstract-deque";
-  version = "0.3";
-  sha256 = "09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base containers random time ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-  description = "Abstract, parameterized interface to mutable Deques";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/abstract-par.nix b/pkgs/abstract-par.nix
deleted file mode 100644
index 27a233f106de9ba74933899a6727d53e298d8788..0000000000000000000000000000000000000000
--- a/pkgs/abstract-par.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "abstract-par";
-  version = "0.3.3";
-  sha256 = "248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/simonmar/monad-par";
-  description = "Type classes generalizing the functionality of the 'monad-par' library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/active.nix b/pkgs/active.nix
index 41fbfcf9b9e7443b5b7740f13a99642c769b6053..70d914b7eb8add920f840b135f9723c37ae2444d 100644
--- a/pkgs/active.nix
+++ b/pkgs/active.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "active";
-  version = "0.2.0.17";
-  sha256 = "0e804cbcf8c10cf95e8a21b8a1caf6cb526f64519399fb4fbbdfc8bcb2ca57f8";
+  version = "0.2.0.18";
+  sha256 = "1697c4757ac69a8881fecd1e985d54887e74175370210dafb828f4419c67c3ba";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/adjunctions.nix b/pkgs/adjunctions.nix
deleted file mode 100644
index 696d3efd4c835a3e09dc6551661441af3691e355..0000000000000000000000000000000000000000
--- a/pkgs/adjunctions.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, array, base, comonad, containers, contravariant
-, distributive, free, generic-deriving, hspec, hspec-discover, lib
-, mtl, profunctors, semigroupoids, semigroups, tagged, transformers
-, transformers-compat, void
-}:
-mkDerivation {
-  pname = "adjunctions";
-  version = "4.4.2";
-  sha256 = "147b5f8db810bca0ea8952ef974982ffc447cecd21f01e1ea1121df77e276518";
-  revision = "1";
-  editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base comonad containers contravariant distributive free mtl
-    profunctors semigroupoids semigroups tagged transformers
-    transformers-compat void
-  ];
-  testHaskellDepends = [ base distributive generic-deriving hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/adjunctions/";
-  description = "Adjunctions and representable functors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/aeson-pretty.nix b/pkgs/aeson-pretty.nix
deleted file mode 100644
index eb7edd5a10cff37af473a422e1e0d41a731d672b..0000000000000000000000000000000000000000
--- a/pkgs/aeson-pretty.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-, cmdargs, lib, scientific, text, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "aeson-pretty";
-  version = "0.8.9";
-  sha256 = "5dbc4f451dfa1e667b2c6ec5170714fed1905dc9cae6a1134b3376f355fa2a08";
-  revision = "2";
-  editedCabalFile = "1895w56jl4c06wfhv5zf8ayqpzkxgva2rz5xxz8fvfdiza781cgp";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base base-compat bytestring scientific text
-    unordered-containers vector
-  ];
-  executableHaskellDepends = [
-    aeson attoparsec base bytestring cmdargs
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/informatikr/aeson-pretty";
-  description = "JSON pretty-printing library and command-line tool";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/alex.nix b/pkgs/alex.nix
index 9cc48accad5aafa08c35e118e07214626b444fc6..af3237a6ebbd696ec06a3559c67264e3b6d2879b 100644
--- a/pkgs/alex.nix
+++ b/pkgs/alex.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "alex";
-  version = "3.2.7.1";
-  sha256 = "9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec";
+  version = "3.4.0.1";
+  sha256 = "4c38e6fce894bde7e63190900c907040f0a3eaa4cbdd2e6eeac173f57f049f36";
   isLibrary = false;
   isExecutable = true;
   enableSeparateDataOutput = true;
diff --git a/pkgs/algebraic-graphs.nix b/pkgs/algebraic-graphs.nix
index 2e3727fc736de9884153532688c1951b6145018d..2397175ef4239afbc79f6a5c5cbfea9bfd1a5e15 100644
--- a/pkgs/algebraic-graphs.nix
+++ b/pkgs/algebraic-graphs.nix
@@ -3,10 +3,10 @@
 }:
 mkDerivation {
   pname = "algebraic-graphs";
-  version = "0.6.1";
-  sha256 = "2d64982591929cbc9a2f184eeb7271b8a4096672fe725c928ea4b97aeac40a99";
+  version = "0.7";
+  sha256 = "51159a0d18690ab51e6709e3c576275402f96f57d901f87d734da6854582e568";
   revision = "1";
-  editedCabalFile = "1lnzgy3z51jyl1ail3wdd817np84gzi2bplccwzbm72glwbakc5h";
+  editedCabalFile = "1z9xls7riv3rlp1vjymvj7z64y8w0x3865d2ad2dzrwsdgzcsndf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ansi-terminal-types.nix b/pkgs/ansi-terminal-types.nix
deleted file mode 100644
index cec9081160046953fc1471d731b57623f54d4eb9..0000000000000000000000000000000000000000
--- a/pkgs/ansi-terminal-types.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, colour, lib }:
-mkDerivation {
-  pname = "ansi-terminal-types";
-  version = "0.11.5";
-  sha256 = "bf7b230389f43105100a6d5740822598a88b38eaaf7d042de595ccf72db4fdd1";
-  revision = "1";
-  editedCabalFile = "02mhl78kmjfa0h22khcjdaaxyvanv717rb2mi3l0jiawv7gl117p";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base colour ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/ansi-terminal";
-  description = "Types and functions used to represent SGR aspects";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ansi-terminal.nix b/pkgs/ansi-terminal.nix
deleted file mode 100644
index ce1a3a0d8a4371f91d68f0b37b2e3729c7cdee48..0000000000000000000000000000000000000000
--- a/pkgs/ansi-terminal.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, ansi-terminal-types, base, colour, lib }:
-mkDerivation {
-  pname = "ansi-terminal";
-  version = "1.0";
-  sha256 = "0798a98f79189e62b5ff0aa247ba95fc3845f0f6f1e14ecceb37facfbdd5cfc9";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ ansi-terminal-types base colour ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/ansi-terminal";
-  description = "Simple ANSI terminal support";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ansi-wl-pprint.nix b/pkgs/ansi-wl-pprint.nix
deleted file mode 100644
index a2659b035fbd498c87d6eb5b3d4e92554608eef6..0000000000000000000000000000000000000000
--- a/pkgs/ansi-wl-pprint.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, ansi-terminal, base, lib }:
-mkDerivation {
-  pname = "ansi-wl-pprint";
-  version = "0.6.9";
-  sha256 = "a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac";
-  revision = "3";
-  editedCabalFile = "1km10sx7ldyv1vfyljik1gqnrwl7bnq2s5m40w41gc930vm48891";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ ansi-terminal base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/ansi-wl-pprint";
-  description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/apecs.nix b/pkgs/apecs.nix
index 363cc703fdc286dfa3fab26bfb747353d869439a..5084c9c7b8a2e97e90bdede7a3637cb2047fd726 100644
--- a/pkgs/apecs.nix
+++ b/pkgs/apecs.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "apecs";
   version = "0.9.5";
   sha256 = "3fdc0547f257ea6ec9abe972148188e673fa1859f53695989761bad7fd9a01d8";
+  revision = "1";
+  editedCabalFile = "1vpjwmyir3ivqzcalazzp4mczln5s2b23lb3rmaag0p1lrlxjxz0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/appar.nix b/pkgs/appar.nix
deleted file mode 100644
index 7d661ca8eaec14df7551fb7f46daa5816009f0e2..0000000000000000000000000000000000000000
--- a/pkgs/appar.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, lib }:
-mkDerivation {
-  pname = "appar";
-  version = "0.1.8";
-  sha256 = "c4ceeddc26525b58d82c41b6d3e32141371a200a6794aae185b6266ccc81631f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A simple applicative parser";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/asn1-encoding.nix b/pkgs/asn1-encoding.nix
deleted file mode 100644
index e040564bf0cd3768c22750864133b823fd93af43..0000000000000000000000000000000000000000
--- a/pkgs/asn1-encoding.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, asn1-types, base, bytestring, hourglass, lib, mtl
-, tasty, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "asn1-encoding";
-  version = "0.9.6";
-  sha256 = "d9f8deabd3b908e5cf83c0d813c08dc0143b3ec1c0d97f660d2cfa02c1c8da0a";
-  revision = "2";
-  editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
-  testHaskellDepends = [
-    asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/vincenthz/hs-asn1";
-  description = "ASN1 data reader and writer in RAW, BER and DER forms";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/asn1-parse.nix b/pkgs/asn1-parse.nix
deleted file mode 100644
index 1d24b63b547b46e2317fe85a79d542e8f1280faf..0000000000000000000000000000000000000000
--- a/pkgs/asn1-parse.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, asn1-encoding, asn1-types, base, bytestring, lib }:
-mkDerivation {
-  pname = "asn1-parse";
-  version = "0.9.5";
-  sha256 = "8f1fe1344d30b39dc594d74df2c55209577722af1497204b4c2b6d6e8747f39e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    asn1-encoding asn1-types base bytestring
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/vincenthz/hs-asn1";
-  description = "Simple monadic parser for ASN1 stream types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/asn1-types.nix b/pkgs/asn1-types.nix
deleted file mode 100644
index 1a1ecc20bdacfb2876459b0cdd08bfab628f5e5d..0000000000000000000000000000000000000000
--- a/pkgs/asn1-types.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, bytestring, hourglass, lib, memory }:
-mkDerivation {
-  pname = "asn1-types";
-  version = "0.3.4";
-  sha256 = "78ee92a251379298ca820fa53edbf4b33c539b9fcd887c86f520c30e3b4e21a8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring hourglass memory ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-asn1";
-  description = "ASN.1 types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/async.nix b/pkgs/async.nix
deleted file mode 100644
index 3904b4c003a64ed2fdca3c91d77196719bdc6a0b..0000000000000000000000000000000000000000
--- a/pkgs/async.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, base, hashable, lib, stm, test-framework
-, test-framework-hunit
-}:
-mkDerivation {
-  pname = "async";
-  version = "2.2.4";
-  sha256 = "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725";
-  revision = "3";
-  editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hashable stm ];
-  testHaskellDepends = [
-    base HUnit stm test-framework test-framework-hunit
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/simonmar/async";
-  description = "Run IO operations asynchronously and wait for their results";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/atomic-primops.nix b/pkgs/atomic-primops.nix
deleted file mode 100644
index 1efb8eee9382f1b910981dd1ccd856bf05682847..0000000000000000000000000000000000000000
--- a/pkgs/atomic-primops.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib, primitive }:
-mkDerivation {
-  pname = "atomic-primops";
-  version = "0.8.4";
-  sha256 = "22a8617eb9e221b5daee1ae26ccce279ce3d7a53d76e82c767708f90a6c72d3e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim primitive ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-  description = "A safe approach to CAS and other atomic ops in Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/atomic-write.nix b/pkgs/atomic-write.nix
deleted file mode 100644
index 0752dfb40691fc7e30498a71e912ba190690bac2..0000000000000000000000000000000000000000
--- a/pkgs/atomic-write.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, bytestring, directory, filepath, hspec, lib
-, temporary, text, unix-compat
-}:
-mkDerivation {
-  pname = "atomic-write";
-  version = "0.2.0.7";
-  sha256 = "b5f5c77884bc0332306fab89acf1c8a8582d76eabaa303c91b1c4072621c960d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring directory filepath temporary text unix-compat
-  ];
-  testHaskellDepends = [
-    base bytestring filepath hspec temporary text unix-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/stackbuilders/atomic-write";
-  description = "Atomically write to a file";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/assoc.nix b/pkgs/attoparsec-aeson.nix
similarity index 50%
rename from pkgs/assoc.nix
rename to pkgs/attoparsec-aeson.nix
index 744355c33779af0c3188b154fea1f3f1b60e03d2..0517e03df67667d06b9967ee087ae9069aaecef1 100644
--- a/pkgs/assoc.nix
+++ b/pkgs/attoparsec-aeson.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, base, lib, tagged }:
+{ mkDerivation, aeson, base, lib }:
 mkDerivation {
-  pname = "assoc";
-  version = "1.1";
-  sha256 = "7aa2e6548b3d9d49a286ac20639479aaf6c47a1446113ed784d98737c5f60df4";
+  pname = "attoparsec-aeson";
+  version = "2.1.0.0";
+  sha256 = "b34afb1c330428d9ff7e9e99655ece826ed7a1928dd5880c8127e73a12e906a9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base tagged ];
+  libraryHaskellDepends = [ aeson base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -14,7 +14,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
+  homepage = "https://github.com/haskell/aeson";
+  description = "Parsing of aeson's Value with attoparsec";
   license = lib.licenses.bsd3;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/attoparsec-iso8601.nix b/pkgs/attoparsec-iso8601.nix
index 4afd2fbb1eed4c865a7a702b1092fe2ce426aec2..c924c8da65ff13c6ac4288751d754494acaef7bc 100644
--- a/pkgs/attoparsec-iso8601.nix
+++ b/pkgs/attoparsec-iso8601.nix
@@ -1,17 +1,15 @@
-{ mkDerivation, attoparsec, base, base-compat-batteries, lib, text
+{ mkDerivation, attoparsec, base, integer-conversion, lib, text
 , time, time-compat
 }:
 mkDerivation {
   pname = "attoparsec-iso8601";
-  version = "1.1.0.0";
-  sha256 = "1109a817c448a154ec58047a8f01282530cb40d20fbd5690bc58b1443ecb264a";
-  revision = "1";
-  editedCabalFile = "1h84bvjji5kwk54fr8q2gs8qhb39xwsm585s3472vvjh54dllf31";
+  version = "1.1.0.1";
+  sha256 = "73206fb9cb46e8608940b3dd7acbff76d62a76ec4e8d2070a855ecab4649916b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec base base-compat-batteries text time time-compat
+    attoparsec base integer-conversion text time time-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/attoparsec.nix b/pkgs/attoparsec.nix
deleted file mode 100644
index ac5033af82fa2c4c2d9d1e66a73c00e64d4507df..0000000000000000000000000000000000000000
--- a/pkgs/attoparsec.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, bytestring
-, case-insensitive, containers, deepseq, directory, filepath
-, ghc-prim, http-types, lib, parsec, quickcheck-unicode, scientific
-, tasty, tasty-bench, tasty-quickcheck, text, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "attoparsec";
-  version = "0.14.4";
-  sha256 = "3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c";
-  revision = "3";
-  editedCabalFile = "1ciz49yg6zcaf5dvh5wp3kv92jxa23pblggfldbmy5q54dr5nish";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers deepseq ghc-prim scientific text
-    transformers
-  ];
-  testHaskellDepends = [
-    array base bytestring deepseq QuickCheck quickcheck-unicode
-    scientific tasty tasty-quickcheck text transformers vector
-  ];
-  benchmarkHaskellDepends = [
-    array base bytestring case-insensitive containers deepseq directory
-    filepath ghc-prim http-types parsec scientific tasty-bench text
-    transformers unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/attoparsec";
-  description = "Fast combinator parsing for bytestrings and text";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/auto-update.nix b/pkgs/auto-update.nix
deleted file mode 100644
index a119835df2ec99266815ee2001e2c0cb3662135e..0000000000000000000000000000000000000000
--- a/pkgs/auto-update.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HUnit, base, exceptions, hspec, lib, retry }:
-mkDerivation {
-  pname = "auto-update";
-  version = "0.1.6";
-  sha256 = "f4e023dc8713c387ecf20d851247597fd012cabea3872310b35e911105eb66c4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base exceptions hspec HUnit retry ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/wai";
-  description = "Efficiently run periodic, on-demand actions";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/autodocodec-schema.nix b/pkgs/autodocodec-schema.nix
deleted file mode 100644
index b47e0b5ce8856970611db86826545bdbd062349a..0000000000000000000000000000000000000000
--- a/pkgs/autodocodec-schema.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, aeson, autodocodec, base, containers, lib, mtl
-, text, unordered-containers, validity, validity-aeson
-, validity-containers, validity-text
-}:
-mkDerivation {
-  pname = "autodocodec-schema";
-  version = "0.1.0.3";
-  sha256 = "bccda22edd27c0122af6eb1a30ea2c1f0a1af7ac819cf004e8945e60837369e5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson autodocodec base containers mtl text unordered-containers
-    validity validity-aeson validity-containers validity-text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/autodocodec#readme";
-  description = "Autodocodec interpreters for JSON Schema";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/autodocodec-yaml.nix b/pkgs/autodocodec-yaml.nix
deleted file mode 100644
index 12fc016ab49e4d5c3c0461270076438f916ed739..0000000000000000000000000000000000000000
--- a/pkgs/autodocodec-yaml.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, autodocodec, autodocodec-schema, base, bytestring
-, containers, lib, path, path-io, safe-coloured-text, scientific
-, text, unordered-containers, vector, yaml
-}:
-mkDerivation {
-  pname = "autodocodec-yaml";
-  version = "0.2.0.3";
-  sha256 = "6ea45746fafee0e7c286cd96c0dccb26e8466552c5dd990bc1d83e09fe1f8e01";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    autodocodec autodocodec-schema base bytestring containers path
-    path-io safe-coloured-text scientific text unordered-containers
-    vector yaml
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/autodocodec#readme";
-  description = "Autodocodec interpreters for yaml";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/autodocodec.nix b/pkgs/autodocodec.nix
deleted file mode 100644
index 5307435955951d6ab54d89ff20a827a75dd55669..0000000000000000000000000000000000000000
--- a/pkgs/autodocodec.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, containers, hashable, lib
-, mtl, scientific, text, time, unordered-containers, validity
-, validity-scientific, vector
-}:
-mkDerivation {
-  pname = "autodocodec";
-  version = "0.2.0.3";
-  sha256 = "060fabff7c641d0c7cc4f9b22c4b03a08d1c7d0e615b7ebe38612e4a64f71ec6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bytestring containers hashable mtl scientific text time
-    unordered-containers validity validity-scientific vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/autodocodec#readme";
-  description = "Self-documenting encoder and decoder";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/barbies.nix b/pkgs/barbies.nix
deleted file mode 100644
index 6cbe4ed90a8444c7571e7f0344cccbc2e0658380..0000000000000000000000000000000000000000
--- a/pkgs/barbies.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, distributive, lib, tasty
-, tasty-hunit, tasty-quickcheck, transformers
-}:
-mkDerivation {
-  pname = "barbies";
-  version = "2.0.4.0";
-  sha256 = "e2a01762041ff15ab7a33d85d1fe15e95c0e4018ad8718dcc3d3a112fb640b6d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base distributive transformers ];
-  testHaskellDepends = [
-    base distributive QuickCheck tasty tasty-hunit tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jcpetruzza/barbies#readme";
-  description = "Classes for working with types that can change clothes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/base-compat-batteries.nix b/pkgs/base-compat-batteries.nix
deleted file mode 100644
index 89bb6d7cd830d2a1c81a85f014e04a7a8f5811ce..0000000000000000000000000000000000000000
--- a/pkgs/base-compat-batteries.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, OneTuple, QuickCheck, base, base-compat
-, foldable1-classes-compat, ghc-prim, hspec, hspec-discover, lib
-}:
-mkDerivation {
-  pname = "base-compat-batteries";
-  version = "0.13.0";
-  sha256 = "3768af40d1d64f9b0845a8ddb18e63ba3a4c765d0d96db9dc28b5b66d1232f98";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat foldable1-classes-compat ghc-prim OneTuple
-  ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "base-compat with extra batteries";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/base-compat.nix b/pkgs/base-compat.nix
deleted file mode 100644
index f1f4bf55a2c31aef9a7ae662a56a012c8673c583..0000000000000000000000000000000000000000
--- a/pkgs/base-compat.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib, unix }:
-mkDerivation {
-  pname = "base-compat";
-  version = "0.13.0";
-  sha256 = "8bf66075da849a037974a7feb9d7ecd81ce57e4522a0df40daf11db14fcea30d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim unix ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A compatibility layer for base";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/base-orphans.nix b/pkgs/base-orphans.nix
deleted file mode 100644
index f183e5d5a4537d2226f3a1835c00adcac5130bc3..0000000000000000000000000000000000000000
--- a/pkgs/base-orphans.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, QuickCheck, base, ghc-prim, hspec, hspec-discover
-, lib
-}:
-mkDerivation {
-  pname = "base-orphans";
-  version = "0.9.0";
-  sha256 = "613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-compat/base-orphans#readme";
-  description = "Backwards-compatible orphan instances for base";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/base-prelude.nix b/pkgs/base-prelude.nix
index 3e7ecc2d71aa3accd935c36bd5c8ff53fd3d2a65..687358cb0b44fb1b5a67454e3b428a43ea05917e 100644
--- a/pkgs/base-prelude.nix
+++ b/pkgs/base-prelude.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "base-prelude";
-  version = "1.6.1";
-  sha256 = "729034d1d83d8eacdf84399f97c4f9b99bb710555ddc1e0b9f196f5dd0347d65";
+  version = "1.6.1.1";
+  sha256 = "8108af03f2c9d6dc4fe9e7033afc53f0472d1e520261cef0ec3e420b29521dd3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/base16-bytestring.nix b/pkgs/base16-bytestring.nix
deleted file mode 100644
index c6d243c97f80412da5580cfdece0c848ae729dcb..0000000000000000000000000000000000000000
--- a/pkgs/base16-bytestring.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, criterion
-, deepseq, lib, test-framework, test-framework-hunit
-, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "base16-bytestring";
-  version = "1.0.2.0";
-  sha256 = "1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [
-    base bytestring HUnit QuickCheck test-framework
-    test-framework-hunit test-framework-quickcheck2
-  ];
-  benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/haskell/base16-bytestring";
-  description = "RFC 4648-compliant Base16 encodings for ByteStrings";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/base64-bytestring-type.nix b/pkgs/base64-bytestring-type.nix
index da5e043bc203ebb83318ecb281cccfa7cc642ab2..78c4f9ea28e4c8384afdcf276a69356133f0ee6f 100644
--- a/pkgs/base64-bytestring-type.nix
+++ b/pkgs/base64-bytestring-type.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "base64-bytestring-type";
   version = "1.0.1";
   sha256 = "f607d07c4aab227b4536c495fa7c07b35ddc9c2c013d385c16c02f236526780e";
-  revision = "17";
-  editedCabalFile = "1wbwmwab30g41d9m1xb0vqlfnla6h2f6if53vv99dasd03jqd32l";
+  revision = "18";
+  editedCabalFile = "0ykjgy3c7f6rmx9mj99y21lxsb81pd999pl98x0kvw0fai762hbp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/base64-bytestring.nix b/pkgs/base64-bytestring.nix
index a8dae78999e7ac006eb49254c0bed3fa93815e91..4d71a99fe3a9554a66b16c4b5742e6ebc9264ff0 100644
--- a/pkgs/base64-bytestring.nix
+++ b/pkgs/base64-bytestring.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "base64-bytestring";
   version = "1.2.1.0";
   sha256 = "fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9";
+  revision = "1";
+  editedCabalFile = "00wqskhc31agyxvm7546367qb33v5i3j31sibcw6vihli77mqc25";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/basement.nix b/pkgs/basement.nix
deleted file mode 100644
index 6da0a31c1f6cd25f71a8357c262b9a6f6d63686e..0000000000000000000000000000000000000000
--- a/pkgs/basement.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib }:
-mkDerivation {
-  pname = "basement";
-  version = "0.0.15";
-  sha256 = "56c2afb6754e8d16a627331a8a5d473b3d26fd04ba5c9e0fb3475f595b915db4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-foundation/foundation#readme";
-  description = "Foundation scrap box of array & string";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bech32.nix b/pkgs/bech32.nix
index c0d3905afb7a3af3384d2d4a2ca3a48777a87308..c27f300670fcdd8a677a1c4e10e3029f1fd3b318 100644
--- a/pkgs/bech32.nix
+++ b/pkgs/bech32.nix
@@ -1,11 +1,12 @@
 { mkDerivation, QuickCheck, array, base, base58-bytestring
 , bytestring, containers, deepseq, extra, hspec, hspec-discover
-, lib, memory, optparse-applicative, process, text, vector
+, lib, memory, optparse-applicative, prettyprinter
+, prettyprinter-ansi-terminal, process, text, vector
 }:
 mkDerivation {
   pname = "bech32";
-  version = "1.1.2";
-  sha256 = "489e1922dce97ce59f72d87b17480eb0087b6661d4bcb7be124e027abcb7d2c7";
+  version = "1.1.4";
+  sha256 = "48553d2c017d7dec3450cca628ed09018e345bdb8b368661c0afc05658139a38";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -14,7 +15,7 @@ mkDerivation {
   ];
   executableHaskellDepends = [
     base base58-bytestring bytestring extra memory optparse-applicative
-    text
+    prettyprinter prettyprinter-ansi-terminal text
   ];
   testHaskellDepends = [
     base base58-bytestring bytestring containers deepseq extra hspec
diff --git a/pkgs/bifunctors.nix b/pkgs/bifunctors.nix
deleted file mode 100644
index 8e5651ff1db8b6e86323ed2159b4ffe1ff3fbe52..0000000000000000000000000000000000000000
--- a/pkgs/bifunctors.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, assoc, base, comonad, containers
-, foldable1-classes-compat, hspec, hspec-discover, lib, tagged
-, template-haskell, th-abstraction, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "bifunctors";
-  version = "5.6.1";
-  sha256 = "06381471b5be16516a1b2c4b21a5101a3d991038bface8e0cad144c0044d57fc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    assoc base comonad containers foldable1-classes-compat tagged
-    template-haskell th-abstraction transformers
-  ];
-  testHaskellDepends = [
-    base hspec QuickCheck template-haskell transformers
-    transformers-compat
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/bifunctors/";
-  description = "Bifunctors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bimap.nix b/pkgs/bimap.nix
deleted file mode 100644
index 458bc537b70539993365a124077b010e01273c9e..0000000000000000000000000000000000000000
--- a/pkgs/bimap.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, deepseq, exceptions
-, lib, template-haskell
-}:
-mkDerivation {
-  pname = "bimap";
-  version = "0.5.0";
-  sha256 = "b0b44b0f2eaceb83f46dfa3d1747e080c45204c64d18bb9e63747299266f0c95";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers deepseq exceptions ];
-  testHaskellDepends = [
-    base containers deepseq exceptions QuickCheck template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/joelwilliamson/bimap";
-  description = "Bidirectional mapping between two key types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bin.nix b/pkgs/bin.nix
index 8b7a11d7acf8198d1328ea6afbeefd25b858cf19..5946dafdbfe39579e032fecaeb9a7d4ccfe7dfe4 100644
--- a/pkgs/bin.nix
+++ b/pkgs/bin.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "bin";
   version = "0.1.3";
   sha256 = "fb9cf773bd6e36802748c538696187fe66efbc817c52bfe2f6cfdeff75126d92";
+  revision = "1";
+  editedCabalFile = "0schv2ilmkd37wsw777lx44x4nfs5pn0d7n8wkamzi8m8h0qi5l9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/binary-orphans.nix b/pkgs/binary-orphans.nix
index a62abd4e41a9dfe09dd216865528bfc801453eff..3fea9ac1d1e3a75a3d38b897b9b5c1f16a640745 100644
--- a/pkgs/binary-orphans.nix
+++ b/pkgs/binary-orphans.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "binary-orphans";
   version = "1.0.4.1";
   sha256 = "5f5b789bc86d25bbd054b86b2d9a6a03f4ac0dd480f283564b6d6465cfa2f0d2";
-  revision = "2";
-  editedCabalFile = "1q9fbn41fi4wfk8mrm9izy5jna86gmy7gxhz94crqfhp5f89v58l";
+  revision = "3";
+  editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/binary-parser.nix b/pkgs/binary-parser.nix
index c529e622322fbbc7e2d0a2297a384373a99486d1..941b59a6f0f85afc96959c89d9a78fb6ab3cb4ed 100644
--- a/pkgs/binary-parser.nix
+++ b/pkgs/binary-parser.nix
@@ -1,18 +1,16 @@
-{ mkDerivation, QuickCheck, base, base-prelude, bytestring, lib
-, mtl, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
-, text, transformers
+{ mkDerivation, base, base-prelude, bytestring, lib, mtl, tasty
+, tasty-hunit, tasty-quickcheck, text, transformers
 }:
 mkDerivation {
   pname = "binary-parser";
-  version = "0.5.7.3";
-  sha256 = "6d07b5c759fc60c9b9e7b584538c30d6d3a5987867d2b5386d86f7a80e4ce3d0";
+  version = "0.5.7.4";
+  sha256 = "ba824da8aff477db01478810fee5f485e6e27a19800a42a86ccb3983cbe9931a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring mtl text transformers ];
   testHaskellDepends = [
-    base base-prelude bytestring mtl QuickCheck quickcheck-instances
-    tasty tasty-hunit tasty-quickcheck text transformers
+    base-prelude bytestring tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/bitvec.nix b/pkgs/bitvec.nix
deleted file mode 100644
index 165b4905a5b354b22ac0b625103fbb1ec07b6684..0000000000000000000000000000000000000000
--- a/pkgs/bitvec.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum
-, lib, primitive, quickcheck-classes, quickcheck-classes-base
-, random, tasty, tasty-bench, tasty-quickcheck, vector
-}:
-mkDerivation {
-  pname = "bitvec";
-  version = "1.1.4.0";
-  sha256 = "68f0b1e01604ca8bdeaef47b3621faec456d6f76d6820a321eccd4d3749454a8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring deepseq ghc-bignum primitive vector
-  ];
-  testHaskellDepends = [
-    base ghc-bignum primitive quickcheck-classes
-    quickcheck-classes-base tasty tasty-quickcheck vector
-  ];
-  benchmarkHaskellDepends = [
-    base containers ghc-bignum random tasty tasty-bench vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Bodigrim/bitvec";
-  description = "Space-efficient bit vectors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/blaze-builder.nix b/pkgs/blaze-builder.nix
deleted file mode 100644
index 029f8fc4e5e2bf69059ca7f7741d47ae9159c849..0000000000000000000000000000000000000000
--- a/pkgs/blaze-builder.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, deepseq
-, ghc-prim, lib, test-framework, test-framework-hunit
-, test-framework-quickcheck2, text, utf8-string
-}:
-mkDerivation {
-  pname = "blaze-builder";
-  version = "0.4.2.2";
-  sha256 = "2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67";
-  revision = "1";
-  editedCabalFile = "026vxh94h2hwncy1mn51xzfpnhj8ijp5xc8fpq7dwc63fkrps0gh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring deepseq ghc-prim text ];
-  testHaskellDepends = [
-    base bytestring HUnit QuickCheck test-framework
-    test-framework-hunit test-framework-quickcheck2 text utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/blaze-builder/blaze-builder";
-  description = "Efficient buffered output";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/blaze-html.nix b/pkgs/blaze-html.nix
deleted file mode 100644
index e9bd3636ee9796facafc305f48d94160801c059f..0000000000000000000000000000000000000000
--- a/pkgs/blaze-html.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, blaze-builder
-, blaze-markup, bytestring, containers, lib, test-framework
-, test-framework-hunit, test-framework-quickcheck2, text
-}:
-mkDerivation {
-  pname = "blaze-html";
-  version = "0.9.1.2";
-  sha256 = "60503f42546c6c1b954014d188ea137e43d74dcffd2bf6157c113fd91a0c394c";
-  revision = "2";
-  editedCabalFile = "1hjxvz62wlg0x7svc51zascgc96f5ly9xkkiyllgb4aqcvx9zf3l";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base blaze-builder blaze-markup bytestring text
-  ];
-  testHaskellDepends = [
-    base blaze-builder blaze-markup bytestring containers HUnit
-    QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2 text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://jaspervdj.be/blaze";
-  description = "A blazingly fast HTML combinator library for Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/blaze-markup.nix b/pkgs/blaze-markup.nix
deleted file mode 100644
index 9a4fd0000528a5d37adb2beeecabb541206b4ba9..0000000000000000000000000000000000000000
--- a/pkgs/blaze-markup.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, blaze-builder, bytestring
-, containers, lib, tasty, tasty-hunit, tasty-quickcheck, text
-}:
-mkDerivation {
-  pname = "blaze-markup";
-  version = "0.8.2.8";
-  sha256 = "43fc3f6872dc8d1be8d0fe091bd4775139b42179987f33d6490a7c5f1e07a349";
-  revision = "4";
-  editedCabalFile = "1vlyk6nw2i9bbrvzdq42cd2583lfc8i9rcgmqcvdz5rkp47hbzm8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base blaze-builder bytestring text ];
-  testHaskellDepends = [
-    base blaze-builder bytestring containers HUnit QuickCheck tasty
-    tasty-hunit tasty-quickcheck text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://jaspervdj.be/blaze";
-  description = "A blazingly fast markup combinator library for Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/blaze-svg.nix b/pkgs/blaze-svg.nix
index d489e7e53b0d820dce967ea42eb3d14832721200..1a16758be57ab67aa0281ab639e257922a5e3c39 100644
--- a/pkgs/blaze-svg.nix
+++ b/pkgs/blaze-svg.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, blaze-markup, lib, mtl }:
 mkDerivation {
   pname = "blaze-svg";
-  version = "0.3.6.1";
-  sha256 = "f6a4f1bba1e973b336e94de73369f4562778fde43b6ac7c0b32d6a501527aa60";
-  revision = "1";
-  editedCabalFile = "1vb78d0nvk0909963pm0mnzklcm57w563lhgx1wv7qzdfznpi8f9";
+  version = "0.3.7";
+  sha256 = "4c7c61e67381eeefa30b563004ae639679651aaac499a37ca457d49d7fe8165f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -16,7 +14,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/deepakjois/blaze-svg";
+  homepage = "https://github.com/diagrams/blaze-svg";
   description = "SVG combinator library";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/boring.nix b/pkgs/boring.nix
deleted file mode 100644
index 61ca27daf657a09b70ab7ec9b7fb86f87e744447..0000000000000000000000000000000000000000
--- a/pkgs/boring.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, tagged, transformers }:
-mkDerivation {
-  pname = "boring";
-  version = "0.2.1";
-  sha256 = "b1ffddf0f9d50ac8742aa01b270856d57937cc8f7aae783e3b5f3abee7aa3154";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base tagged transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/boring";
-  description = "Boring and Absurd types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/breakpoint.nix b/pkgs/breakpoint.nix
index 3d28060faf11e15c6190e7be6ee5470117a0b02b..29850143069208abc1902b7bed728c18e15f0d72 100644
--- a/pkgs/breakpoint.nix
+++ b/pkgs/breakpoint.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, ansi-terminal, base, containers, ghc, haskeline
-, lib, mtl, pretty-simple, tasty, tasty-hunit, template-haskell
-, text, transformers
+{ mkDerivation, ansi-terminal, base, containers, deepseq, ghc
+, haskeline, lib, mtl, pretty-simple, tasty, tasty-hunit
+, template-haskell, text, transformers
 }:
 mkDerivation {
   pname = "breakpoint";
-  version = "0.1.2.1";
-  sha256 = "059ac45a5d9e650d61db8167062636f0029ac6ff3c27b1fa3faccc5c195b43ae";
+  version = "0.1.2.2";
+  sha256 = "b51a757785e5baed7a9dfb365cc79d6e519ba52b6680fc5c792eb909a682a20b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal base containers ghc haskeline mtl pretty-simple
-    template-haskell text transformers
+    ansi-terminal base containers deepseq ghc haskeline mtl
+    pretty-simple template-haskell text transformers
   ];
   testHaskellDepends = [ base containers tasty tasty-hunit ];
   enableLibraryProfiling = true;
diff --git a/pkgs/brick.nix b/pkgs/brick.nix
index 2ba8bd92e46058e8ec77eb99e650afb2066b75b4..e457ddfdc9bc927ffd3407a04d42983149248ed9 100644
--- a/pkgs/brick.nix
+++ b/pkgs/brick.nix
@@ -1,19 +1,23 @@
 { mkDerivation, QuickCheck, base, bimap, bytestring, config-ini
 , containers, data-clist, deepseq, directory, exceptions, filepath
 , lib, microlens, microlens-mtl, microlens-th, mtl, stm
-, template-haskell, text, text-zipper, unix, vector, vty, word-wrap
+, template-haskell, text, text-zipper, unix-compat, vector, vty
+, vty-crossplatform, word-wrap
 }:
 mkDerivation {
   pname = "brick";
-  version = "1.9";
-  sha256 = "e34b6dbe715d97fe92fa3d54e6e5ac715e19be8e4a97acaf2c60bf85f0ab6e08";
+  version = "2.0";
+  sha256 = "7c4d74f216c7339754da1ec963202d3d2fe6ebcc8cb61c9474fc5bb4770f3fad";
+  revision = "1";
+  editedCabalFile = "1h8hzph59s11sxvvhpgdpsh04s4hhbp7hyjp768q84bfcy4whjhr";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     base bimap bytestring config-ini containers data-clist deepseq
     directory exceptions filepath microlens microlens-mtl microlens-th
-    mtl stm template-haskell text text-zipper unix vector vty word-wrap
+    mtl stm template-haskell text text-zipper unix-compat vector vty
+    vty-crossplatform word-wrap
   ];
   testHaskellDepends = [
     base containers microlens QuickCheck vector vty
diff --git a/pkgs/bsb-http-chunked.nix b/pkgs/bsb-http-chunked.nix
deleted file mode 100644
index 4293145ece5173b642c79ce9941d913b159b2c4c..0000000000000000000000000000000000000000
--- a/pkgs/bsb-http-chunked.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, attoparsec, base, blaze-builder, bytestring
-, deepseq, doctest, gauge, hedgehog, lib, semigroups, tasty
-, tasty-hedgehog, tasty-hunit
-}:
-mkDerivation {
-  pname = "bsb-http-chunked";
-  version = "0.0.0.4";
-  sha256 = "148309e23eb8b261c1de374712372d62d8c8dc8ee504c392809c7ec33c0a0e7c";
-  revision = "3";
-  editedCabalFile = "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [
-    attoparsec base blaze-builder bytestring doctest hedgehog tasty
-    tasty-hedgehog tasty-hunit
-  ];
-  benchmarkHaskellDepends = [
-    base blaze-builder bytestring deepseq gauge semigroups
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/sjakobi/bsb-http-chunked";
-  description = "Chunked HTTP transfer encoding for bytestring builders";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/byteable.nix b/pkgs/byteable.nix
deleted file mode 100644
index aba669f79c85be4d03d3e019779bfd14410e2666..0000000000000000000000000000000000000000
--- a/pkgs/byteable.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, bytestring, lib }:
-mkDerivation {
-  pname = "byteable";
-  version = "0.1.1";
-  sha256 = "243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base bytestring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-byteable";
-  description = "Type class for sequence of bytes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/byteorder.nix b/pkgs/byteorder.nix
deleted file mode 100644
index 82aa6e0ae8b452339a3e4264e0b86b18149f84b6..0000000000000000000000000000000000000000
--- a/pkgs/byteorder.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "byteorder";
-  version = "1.0.4";
-  sha256 = "bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://community.haskell.org/~aslatter/code/byteorder";
-  description = "Exposes the native endianness or byte ordering of the system";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bytes.nix b/pkgs/bytes.nix
index 5bbe9720d11b2444e466bdf83d017d4da474bca8..eaab0711454ee7e26d2df09b67aacdcbb54f85f9 100644
--- a/pkgs/bytes.nix
+++ b/pkgs/bytes.nix
@@ -1,19 +1,19 @@
 { mkDerivation, base, binary, binary-orphans, bytestring, cereal
-, containers, hashable, lib, mtl, scientific, text, time
-, transformers, transformers-compat, unordered-containers, void
+, containers, hashable, lib, scientific, text, time, transformers
+, transformers-compat, unordered-containers, void
 }:
 mkDerivation {
   pname = "bytes";
-  version = "0.17.2";
-  sha256 = "bc55f41edad589bc0ba389e8b106d7425a87390dcd5f1371e3194a9cc2c4781a";
+  version = "0.17.3";
+  sha256 = "d10acf05802d4df9646d7aed1b4ebcee13fb38f243f1525caaef1f2e1fd929c7";
   revision = "1";
-  editedCabalFile = "0frs6ag93kmg2fw3vd686czx8g7h9qmdn1ip6wdk96d94ap0fz9i";
+  editedCabalFile = "1jj5fk23wvvvlbkxcpvgp69gglbf719ard5g795irbcx11zkhjd2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     base binary binary-orphans bytestring cereal containers hashable
-    mtl scientific text time transformers transformers-compat
+    scientific text time transformers transformers-compat
     unordered-containers void
   ];
   enableLibraryProfiling = true;
diff --git a/pkgs/bytestring-builder.nix b/pkgs/bytestring-builder.nix
deleted file mode 100644
index 3d1093f16f28eed473597a6b8c19190d384291ff..0000000000000000000000000000000000000000
--- a/pkgs/bytestring-builder.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, deepseq, lib }:
-mkDerivation {
-  pname = "bytestring-builder";
-  version = "0.10.8.2.0";
-  sha256 = "27faef6db27c5be5a3715fd68b93725853e0e668849eaf92ce7c33cef9cb2c3f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "The new bytestring builder, packaged outside of GHC";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/bytestring-strict-builder.nix b/pkgs/bytestring-strict-builder.nix
index 1ba5a4f544fab64eb096bc4525ff2b27056cfa4a..5b6b919b272e04d6f63a217312fd40ad906862ee 100644
--- a/pkgs/bytestring-strict-builder.nix
+++ b/pkgs/bytestring-strict-builder.nix
@@ -1,18 +1,16 @@
-{ mkDerivation, QuickCheck, base, bytestring, criterion, lib
-, quickcheck-instances, rerebase, tasty, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, base, bytestring, criterion, lib
+, quickcheck-instances, rerebase, tasty, tasty-quickcheck
 }:
 mkDerivation {
   pname = "bytestring-strict-builder";
-  version = "0.4.5.6";
-  sha256 = "7c9261ff2d10eb141fead8eb57f51fec14b28e753084c7a07fc319776531117f";
+  version = "0.4.5.7";
+  sha256 = "d7a6b1727cb916b4a9ca85a354ae2ce886b73d01ba7b1a488571ab64b4f774f1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-    tasty-quickcheck
+    quickcheck-instances rerebase tasty tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ criterion rerebase ];
   enableLibraryProfiling = true;
diff --git a/pkgs/bytestring-tree-builder.nix b/pkgs/bytestring-tree-builder.nix
index 7a61dd8504a05584e23a4e7ca622188e9ecd4771..d6abcb57e5f1270e821306526c79240338a7c524 100644
--- a/pkgs/bytestring-tree-builder.nix
+++ b/pkgs/bytestring-tree-builder.nix
@@ -1,22 +1,19 @@
-{ mkDerivation, QuickCheck, base, base-prelude, bytestring
-, criterion, deepseq, lib, quickcheck-instances, tasty, tasty-hunit
-, tasty-quickcheck, text
+{ mkDerivation, base, base-prelude, bytestring, criterion, lib
+, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "bytestring-tree-builder";
-  version = "0.2.7.10";
-  sha256 = "29282a224cd60c5c15a21deca658eb764325512ee96be8bc27638764aebd363d";
+  version = "0.2.7.11";
+  sha256 = "b757c9ced07898b8bfd03a04d10bc2caab23ac05093c3e2d68cbf0152d0892cf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text ];
   testHaskellDepends = [
-    base-prelude bytestring QuickCheck quickcheck-instances tasty
-    tasty-hunit tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    base-prelude bytestring criterion deepseq
+    base-prelude bytestring quickcheck-instances tasty tasty-hunit
+    tasty-quickcheck
   ];
+  benchmarkHaskellDepends = [ base-prelude bytestring criterion ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/cabal-doctest.nix b/pkgs/cabal-doctest.nix
deleted file mode 100644
index fd3eddae402b8495faa05ebbf397ca9a35c232e1..0000000000000000000000000000000000000000
--- a/pkgs/cabal-doctest.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, Cabal, base, directory, filepath, lib }:
-mkDerivation {
-  pname = "cabal-doctest";
-  version = "1.0.9";
-  sha256 = "5556088496111d33810c4ae6c4a065bb37fa3315e9e8891e8000b1ab6707ba73";
-  revision = "3";
-  editedCabalFile = "0mh64vifcy5dbbx2n3llhbxx8mczifmipyqwrsb3vx2p2jyhvskd";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base Cabal directory filepath ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/cabal-doctest";
-  description = "A Setup.hs helper for running doctests";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cabal-install-solver.nix b/pkgs/cabal-install-solver.nix
index 7679bba07f4f8e2fee8d26af11d7b570afa05df9..25131bada7c33f1e20f0b6433fbed88d382db7a5 100644
--- a/pkgs/cabal-install-solver.nix
+++ b/pkgs/cabal-install-solver.nix
@@ -4,10 +4,10 @@
 }:
 mkDerivation {
   pname = "cabal-install-solver";
-  version = "3.8.1.0";
-  sha256 = "df2369f6c37517a3b2625bc19057d9e206bbb40386bcb607f17dc7d2e588ffe7";
+  version = "3.10.1.0";
+  sha256 = "2c0d9edd4ccd746e9bf8ab4f92b1ecffe2f56eae29395c67ef5ca091a6f49f37";
   revision = "1";
-  editedCabalFile = "1g487j20pj03pc10yaha18v73wh3ackxjgfpfqaj7xznqcbm5xwm";
+  editedCabalFile = "1l3qhaiv0m2xc5vscggd2drinam1k4x0l3vfvvz15xrpvxypdv4d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/cabal-install.nix b/pkgs/cabal-install.nix
index 76b4561150c5c8978b7ae71ec32c3a7a30f805d7..1db577e343ed42292b149fdb3155fc1ab58e8170 100644
--- a/pkgs/cabal-install.nix
+++ b/pkgs/cabal-install.nix
@@ -10,10 +10,10 @@
 }:
 mkDerivation {
   pname = "cabal-install";
-  version = "3.8.1.0";
-  sha256 = "61ce436f2e14e12bf07ea1c81402362f46275014cd841a76566f0766d0ea67e6";
-  revision = "3";
-  editedCabalFile = "14l2jvyrzhgkmgkrkhmb6cb1vy4pgcg3q8dgyg8vszpm0mb1ws77";
+  version = "3.10.1.0";
+  sha256 = "995de368555449230e0762b259377ed720798717f4dd26a4fa711e8e41c7838d";
+  revision = "1";
+  editedCabalFile = "0h1ra9kw7mk70202whiphbdyvknm7jbhqhkgw4h8abb1sgffhs3n";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/cabal2nix.nix b/pkgs/cabal2nix.nix
deleted file mode 100644
index c0c5e232968b537034cc07060fcef2b7bbe4320b..0000000000000000000000000000000000000000
--- a/pkgs/cabal2nix.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ mkDerivation, Cabal, aeson, ansi-wl-pprint, base, bytestring
-, containers, deepseq, directory, distribution-nixpkgs, filepath
-, hackage-db, hopenssl, hpack, language-nix, lens, lib, monad-par
-, monad-par-extras, mtl, optparse-applicative, pretty, process
-, split, tasty, tasty-golden, text, time, transformers, yaml
-}:
-mkDerivation {
-  pname = "cabal2nix";
-  version = "2.19.1";
-  sha256 = "e0dba35dba0917f4663ba3aee131341dcbf2241112227e07e4d4cfbe37f667b2";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
-    directory distribution-nixpkgs filepath hackage-db hopenssl hpack
-    language-nix lens optparse-applicative pretty process split text
-    time transformers yaml
-  ];
-  executableHaskellDepends = [
-    aeson base bytestring Cabal containers directory
-    distribution-nixpkgs filepath hopenssl language-nix lens monad-par
-    monad-par-extras mtl optparse-applicative pretty
-  ];
-  testHaskellDepends = [
-    base Cabal containers directory filepath language-nix lens pretty
-    process tasty tasty-golden
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  preCheck = ''
-    export PATH="$PWD/dist/build/cabal2nix:$PATH"
-    export HOME="$TMPDIR/home"
-  '';
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Convert Cabal files into Nix build instructions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cache.nix b/pkgs/cache.nix
index 1147e9417148918e0ea1011750a21f393484a4f5..55e59ce06a2f807fb0a48bf86d52c93b90bfbfea 100644
--- a/pkgs/cache.nix
+++ b/pkgs/cache.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "cache";
   version = "0.1.3.0";
   sha256 = "42e9d9f040fab2fd5fc1095a901d6348de73342b1d14254bdaf6ca3d4f11e534";
+  revision = "1";
+  editedCabalFile = "17mn9vm493c2bihz1ivmg1rzy4mnjyvm1y2chrj2hbhf8wixx58s";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/call-stack.nix b/pkgs/call-stack.nix
deleted file mode 100644
index 9a8397d3976c1da60940e499d537ad88dd89f2fb..0000000000000000000000000000000000000000
--- a/pkgs/call-stack.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, filepath, lib, nanospec }:
-mkDerivation {
-  pname = "call-stack";
-  version = "0.4.0";
-  sha256 = "430bcf8a3404f7e55319573c0b807b1356946f0c8f289bb3d9afb279c636b87b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base filepath nanospec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sol/call-stack#readme";
-  description = "Use GHC call-stacks in a backward compatible way";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/case-insensitive.nix b/pkgs/case-insensitive.nix
deleted file mode 100644
index 713c41b5902dab15ed2bd489b13be76485536f71..0000000000000000000000000000000000000000
--- a/pkgs/case-insensitive.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, criterion, deepseq
-, hashable, lib, test-framework, test-framework-hunit, text
-}:
-mkDerivation {
-  pname = "case-insensitive";
-  version = "1.2.1.0";
-  sha256 = "296dc17e0c5f3dfb3d82ced83e4c9c44c338ecde749b278b6eae512f1d04e406";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-  testHaskellDepends = [
-    base bytestring HUnit test-framework test-framework-hunit text
-  ];
-  benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/basvandijk/case-insensitive";
-  description = "Case insensitive string comparison";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cassava.nix b/pkgs/cassava.nix
index 17f4d50927f670e961a3e3e6ef2161d57a02b57d..0d208876ed5118a5e73374afb04ecac6706c4901 100644
--- a/pkgs/cassava.nix
+++ b/pkgs/cassava.nix
@@ -8,8 +8,8 @@ mkDerivation {
   pname = "cassava";
   version = "0.5.3.0";
   sha256 = "b4c8451f433ad7725cb8b9f7a7efe598ba103b16584713c91f48ae023829e9be";
-  revision = "1";
-  editedCabalFile = "1lavd2c7w2p2x4i7h35r8kgcgrrlhcql70zk5vgqv5ll04pp0niy";
+  revision = "5";
+  editedCabalFile = "081c6gzskkdvajc38f8ng8471d58a25k7wpl3azjviqm6vzfl2c4";
   configureFlags = [ "-f-bytestring--lt-0_10_4" ];
   isLibrary = true;
   isExecutable = false;
diff --git a/pkgs/cborg-json.nix b/pkgs/cborg-json.nix
deleted file mode 100644
index 93fea46ec269fc5b4b5e95ec7434ab1c7c7a05b0..0000000000000000000000000000000000000000
--- a/pkgs/cborg-json.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg
-, criterion, deepseq, directory, lib, process, scientific, text
-, unordered-containers, vector, zlib
-}:
-mkDerivation {
-  pname = "cborg-json";
-  version = "0.2.5.0";
-  sha256 = "58c373453f06fd8558e062c4fbe6dd862cb0ae28ac3c02ba3b607573bd077cd4";
-  revision = "1";
-  editedCabalFile = "0zzn2p6yl9mqw7agm5w7iiz105078gv66vxr8bqazilgssqk5wyg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson aeson-pretty base cborg scientific text unordered-containers
-    vector
-  ];
-  benchmarkHaskellDepends = [
-    aeson base bytestring cborg criterion deepseq directory process
-    zlib
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/well-typed/cborg";
-  description = "A library for encoding JSON as CBOR";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cborg.nix b/pkgs/cborg.nix
deleted file mode 100644
index d0d7925a8ca4adfd5c14d90ebd54b07606ca20a0..0000000000000000000000000000000000000000
--- a/pkgs/cborg.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, array, base, base-orphans
-, base16-bytestring, base64-bytestring, bytestring, containers
-, deepseq, ghc-bignum, ghc-prim, half, lib, primitive, random
-, scientific, tasty, tasty-hunit, tasty-quickcheck, text, vector
-}:
-mkDerivation {
-  pname = "cborg";
-  version = "0.2.8.0";
-  sha256 = "2e59c827c273b57af0fcbbfb62f6d15faeb399e0d89d57baf8adcc60e62ab01e";
-  revision = "2";
-  editedCabalFile = "0pvnzanysxiikq3kghhax9v2m693s23v9pas03iaggw0h098yns4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers deepseq ghc-bignum ghc-prim half
-    primitive text
-  ];
-  testHaskellDepends = [
-    aeson array base base-orphans base16-bytestring base64-bytestring
-    bytestring deepseq half QuickCheck random scientific tasty
-    tasty-hunit tasty-quickcheck text vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Concise Binary Object Representation (CBOR)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cereal-vector.nix b/pkgs/cereal-vector.nix
deleted file mode 100644
index 0925986cb912540bd85aa86bfa7e33bbcdb9e4bf..0000000000000000000000000000000000000000
--- a/pkgs/cereal-vector.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, cereal, lib, vector
-}:
-mkDerivation {
-  pname = "cereal-vector";
-  version = "0.2.0.1";
-  sha256 = "ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring cereal vector ];
-  testHaskellDepends = [ base cereal QuickCheck vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/acfoltzer/cereal-vector";
-  description = "Serialize instances for Data.Vector types.";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cereal.nix b/pkgs/cereal.nix
deleted file mode 100644
index 76853397dd0f51819fe8df591f047c576c862dab..0000000000000000000000000000000000000000
--- a/pkgs/cereal.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, bytestring, containers
-, ghc-prim, lib, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "cereal";
-  version = "0.5.8.3";
-  sha256 = "99905220661b26e5bd91130bd9772554938608a5b1d717240a6eb331121e0f6a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers ghc-prim
-  ];
-  testHaskellDepends = [
-    base bytestring QuickCheck test-framework
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/GaloisInc/cereal";
-  description = "A binary serialization library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/charset.nix b/pkgs/charset.nix
deleted file mode 100644
index 8a8ce37c9303dbbd34aab22d6511219e7413c93b..0000000000000000000000000000000000000000
--- a/pkgs/charset.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, lib
-, unordered-containers
-}:
-mkDerivation {
-  pname = "charset";
-  version = "0.3.9";
-  sha256 = "cb4f8781491d1e346e7eef7b33bfadae96642c81777165ec585a05591abc998b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/charset";
-  description = "Fast unicode character sets based on complemented PATRICIA tries";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/chell-quickcheck.nix b/pkgs/chell-quickcheck.nix
index 5e63b6908e9c48f3d1979ff5e9fdd04a4caadcad..d07ae6ae8b315064e6732dc42e05f7461066cc70 100644
--- a/pkgs/chell-quickcheck.nix
+++ b/pkgs/chell-quickcheck.nix
@@ -1,8 +1,8 @@
 { mkDerivation, QuickCheck, base, chell, lib, random }:
 mkDerivation {
   pname = "chell-quickcheck";
-  version = "0.2.5.3";
-  sha256 = "1db092893f392665dcdb8c422cad8e8b6e7a6d6c84da35c50fc7a757d47ea2ae";
+  version = "0.2.5.4";
+  sha256 = "91543124f73b32f314ba67c7f39f7cb70563097f021dc394ce36e9629cd1cc10";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,7 +15,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/typeclasses/chell";
-  description = "QuickCheck support for the Chell testing library";
+  description = "QuickCheck support for Chell";
   license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/chell.nix b/pkgs/chell.nix
index 46cba8eccc004b81a8ddb4c6d9456784cda755b1..9602e4a766e64679339c3608eeed72137e937f71 100644
--- a/pkgs/chell.nix
+++ b/pkgs/chell.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "chell";
-  version = "0.5.0.1";
-  sha256 = "fa8d843d284a3ba77585e43160731d7d8845686d9a2f3117f631939fa9b2f783";
+  version = "0.5.0.2";
+  sha256 = "bbbb035b800ee924e5d14f6598fc16512b5065773b1d57a8fe08f8626fe9c1c7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/clock.nix b/pkgs/clock.nix
deleted file mode 100644
index f8f2aa8ebf7cbc60e25d42625ec3291625c1e451..0000000000000000000000000000000000000000
--- a/pkgs/clock.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, criterion, lib, tasty, tasty-quickcheck }:
-mkDerivation {
-  pname = "clock";
-  version = "0.8.3";
-  sha256 = "845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base tasty tasty-quickcheck ];
-  benchmarkHaskellDepends = [ base criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/corsis/clock";
-  description = "High-resolution clock functions: monotonic, realtime, cputime";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cmark-gfm.nix b/pkgs/cmark-gfm.nix
index 0c141fbcb049e0379b115a2e00ef4e9d5fe539c7..3cdb627dc9c12a194f7c85945297ad8c057358c6 100644
--- a/pkgs/cmark-gfm.nix
+++ b/pkgs/cmark-gfm.nix
@@ -3,8 +3,10 @@
 }:
 mkDerivation {
   pname = "cmark-gfm";
-  version = "0.2.5";
-  sha256 = "411caca0dd16c381d093a563b0002c057a3bdb396d3d3f81ad7fecca40d34451";
+  version = "0.2.6";
+  sha256 = "958cfb3bd54b1bfa9e1e2d9cd1748e76c10d2b30a3cceeab3f6a852205c1a869";
+  revision = "1";
+  editedCabalFile = "1385k2xvxy9ssw69g606vwnpm07sf919prciwvnaipsxiwwbjwl6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/cmdargs.nix b/pkgs/cmdargs.nix
deleted file mode 100644
index 043cd0ce3924c12eb1431b0d5bfc9fe60417ceb8..0000000000000000000000000000000000000000
--- a/pkgs/cmdargs.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, filepath, lib, process, template-haskell
-, transformers
-}:
-mkDerivation {
-  pname = "cmdargs";
-  version = "0.10.22";
-  sha256 = "b8b12e7f8795cf13037bb062d453b86c788eae62558586f59e9419aabe6e9bef";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base filepath process template-haskell transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/cmdargs#readme";
-  description = "Command line argument processing";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/co-log-core.nix b/pkgs/co-log-core.nix
index 935b86f9f418fac64520a0b27fbf786ff24b99e9..c59a3e129856273c0d9cee57002b2e8044adab6f 100644
--- a/pkgs/co-log-core.nix
+++ b/pkgs/co-log-core.nix
@@ -1,10 +1,8 @@
 { mkDerivation, Glob, base, doctest, lib }:
 mkDerivation {
   pname = "co-log-core";
-  version = "0.3.2.0";
-  sha256 = "3495edd3a0c4a1bf4b9dbc30df0a23bdb14848f57a8b71cfa81511ab38c11ee5";
-  revision = "1";
-  editedCabalFile = "0ljr9pam99q2mgqig8yf1pmz5j0jxk6dq9c2rvzyc4jbv6bnbwnf";
+  version = "0.3.2.1";
+  sha256 = "7e12a8e02a02c0e2c13e8def101ee8243c6c033392cd3031b63fe5db5168ff87";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/co-log-polysemy.nix b/pkgs/co-log-polysemy.nix
index bcbd27c101e77a4f18bb8b3cf6f3bb9357cf24d0..ad2be0921b3d6fd3fce001cc7e7035260cc222a3 100644
--- a/pkgs/co-log-polysemy.nix
+++ b/pkgs/co-log-polysemy.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, co-log-core, lib, polysemy }:
 mkDerivation {
   pname = "co-log-polysemy";
-  version = "0.0.1.3";
-  sha256 = "775989212f33126b035e1f26e836fc197c042d08811dca7ddf25b56fbdf3d7b0";
+  version = "0.0.1.4";
+  sha256 = "de577295c06efe53b49f88360c498f4a10a90708b900ecb004e3a10f8d1250b1";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/code-page.nix b/pkgs/code-page.nix
deleted file mode 100644
index aa7365b516a2a6e1183d981e0f53fae14a4894f9..0000000000000000000000000000000000000000
--- a/pkgs/code-page.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "code-page";
-  version = "0.2.1";
-  sha256 = "b2f90e19c61ed8a6ff7295f7f123d4a9913c790d4cf2c6029bc299293fdb2aaa";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/RyanGlScott/code-page";
-  description = "Windows code page library for Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/colour.nix b/pkgs/colour.nix
deleted file mode 100644
index b37401f69961e86b7ce6ed430b8a020c18a3effa..0000000000000000000000000000000000000000
--- a/pkgs/colour.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, lib, random, test-framework
-, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "colour";
-  version = "2.3.6";
-  sha256 = "2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [
-    base QuickCheck random test-framework test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.haskell.org/haskellwiki/Colour";
-  description = "A model for human colour/color perception";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/colourista.nix b/pkgs/colourista.nix
index 610d0f2addc9e9ae672970da509002bcfb6bb01d..cdeb051bfb676f958659506a568df92d4e91efe1 100644
--- a/pkgs/colourista.nix
+++ b/pkgs/colourista.nix
@@ -4,6 +4,8 @@ mkDerivation {
   pname = "colourista";
   version = "0.1.0.2";
   sha256 = "96afae0b54b12205a9871ecb4c7ee173e8b9f05363d843c15d373d394d08063c";
+  revision = "3";
+  editedCabalFile = "1q07rz48xrs68gg3pywdivw2m97xbgcb4337jfzdsb0wv6n8z2r5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/commonmark-extensions.nix b/pkgs/commonmark-extensions.nix
index 7f90c69abd10bd813aaaea175d7767c8b51aed35..c86c911d323a56d339e09be261d5fcf4781e3dfb 100644
--- a/pkgs/commonmark-extensions.nix
+++ b/pkgs/commonmark-extensions.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "commonmark-extensions";
-  version = "0.2.3.4";
-  sha256 = "a084efe90311f8a0d83d8622ef76f17dfdb974a84b74df454cf906b0ee64665e";
+  version = "0.2.4";
+  sha256 = "36757b95cca25b51bb81df41ba656a4e9671f49e7b44e26bdffcdfb8a8183ffb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/commonmark.nix b/pkgs/commonmark.nix
index 29adf0a79bb07b4e3fb8e79dc4971e875f8aeadd..46f9f312121bdde4d2c64a632f5d0bb3419c399b 100644
--- a/pkgs/commonmark.nix
+++ b/pkgs/commonmark.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "commonmark";
-  version = "0.2.2";
-  sha256 = "b70b421f5753d983745e558d7d66a5e346ee5b2ebc0a827e9f63f8ff7a62b24e";
+  version = "0.2.4";
+  sha256 = "557fcef92671eec142068c7772734d41c727659c51eb93db09acca693f9a1d56";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/comonad.nix b/pkgs/comonad.nix
deleted file mode 100644
index ec09418f25c5436a04912a86b7f1363d87ac2a66..0000000000000000000000000000000000000000
--- a/pkgs/comonad.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, distributive, indexed-traversable
-, lib, tagged, transformers, transformers-compat
-}:
-mkDerivation {
-  pname = "comonad";
-  version = "5.0.8";
-  sha256 = "ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13";
-  revision = "1";
-  editedCabalFile = "0zlgkcd61cwsdbgjz03pfbjxhj6dc25792h7rwh0zy677vbsn6hz";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers distributive indexed-traversable tagged
-    transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/comonad/";
-  description = "Comonads";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/compact.nix b/pkgs/compact.nix
index 028a2c94a0b94b48b2b3167cf4e566d9a7ff2f8e..51a4e79346c5250ed720e556896a849f93acffca 100644
--- a/pkgs/compact.nix
+++ b/pkgs/compact.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "compact";
   version = "0.2.0.0";
   sha256 = "03a6b534f4f8f06fe1f3921be74f90c2fab9da7f28e7520612c91c28da266277";
-  revision = "1";
-  editedCabalFile = "1013dkawaw3c6hvlfn9x584pq8z65fvbnp79dl6ll6r0a75rivvm";
+  revision = "2";
+  editedCabalFile = "1x38yjkl9b2ss6p9bdhpk5h1p4p3rlar09a31cpa8cgj959ws1da";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/composite-base.nix b/pkgs/composite-base.nix
index 9eca883b45de734a8314f830b35fa7fddcb53e9a..da86cfc7e2aaa022faf91860b0b1476272d3a92a 100644
--- a/pkgs/composite-base.nix
+++ b/pkgs/composite-base.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "composite-base";
   version = "0.8.2.1";
   sha256 = "31b7fe24885d2db164524a4477058157592ae06a75da5259f0eafc5760555544";
+  revision = "1";
+  editedCabalFile = "1fww7f7z583vp7kfrf6xi6y0plpm4jsh3j72xbgarprlz25j1aip";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/concurrent-output.nix b/pkgs/concurrent-output.nix
deleted file mode 100644
index 121c179679844420d35127b3baface69b70cfbe3..0000000000000000000000000000000000000000
--- a/pkgs/concurrent-output.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, ansi-terminal, async, base, directory, exceptions
-, lib, process, stm, terminal-size, text, transformers, unix
-}:
-mkDerivation {
-  pname = "concurrent-output";
-  version = "1.10.17";
-  sha256 = "0b509997639af0e3ab6645d81fadd45b7e7a51117de92da995c18f1d9bbcb589";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal async base directory exceptions process stm
-    terminal-size text transformers unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Ungarble output from several threads or commands";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/conduit-extra.nix b/pkgs/conduit-extra.nix
deleted file mode 100644
index c6676f89d32585dffc6b66226cbda9f60588c741..0000000000000000000000000000000000000000
--- a/pkgs/conduit-extra.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, QuickCheck, async, attoparsec, base, bytestring
-, conduit, directory, exceptions, filepath, gauge, hspec
-, hspec-discover, lib, network, primitive, process, resourcet, stm
-, streaming-commons, text, transformers, transformers-base
-, typed-process, unliftio-core
-}:
-mkDerivation {
-  pname = "conduit-extra";
-  version = "1.3.6";
-  sha256 = "8950c38049d892c38590d389bed49ecf880671f58ec63dd4709d9fe3d4b8f153";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async attoparsec base bytestring conduit directory filepath network
-    primitive process resourcet stm streaming-commons text transformers
-    typed-process unliftio-core
-  ];
-  testHaskellDepends = [
-    async attoparsec base bytestring conduit directory exceptions
-    filepath hspec process QuickCheck resourcet stm streaming-commons
-    text transformers transformers-base
-  ];
-  testToolDepends = [ hspec-discover ];
-  benchmarkHaskellDepends = [
-    base bytestring conduit gauge transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/snoyberg/conduit";
-  description = "Batteries included conduit: adapters for common libraries";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/conduit.nix b/pkgs/conduit.nix
deleted file mode 100644
index 0898837261b8dcb8403ee77d7c47b495f3b74a5a..0000000000000000000000000000000000000000
--- a/pkgs/conduit.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, containers, deepseq
-, directory, exceptions, filepath, gauge, hspec, kan-extensions
-, lib, mono-traversable, mtl, mwc-random, primitive, resourcet
-, safe, silently, split, text, transformers, unix, unliftio
-, unliftio-core, vector
-}:
-mkDerivation {
-  pname = "conduit";
-  version = "1.3.4.3";
-  sha256 = "aca2a086a6ee065a5d1f1efc0632bccf52a8f961e4134a4fb60447765987907d";
-  revision = "1";
-  editedCabalFile = "0fsvnlx8gd9d8f70f6gl68ljhmff790anrifrixcflz0j2kfxwjh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring directory exceptions filepath mono-traversable mtl
-    primitive resourcet text transformers unix unliftio-core vector
-  ];
-  testHaskellDepends = [
-    base bytestring containers directory exceptions filepath hspec
-    mono-traversable mtl QuickCheck resourcet safe silently split text
-    transformers unliftio vector
-  ];
-  benchmarkHaskellDepends = [
-    base containers deepseq gauge hspec kan-extensions mwc-random
-    transformers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/snoyberg/conduit";
-  description = "Streaming data processing library";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/config-ini.nix b/pkgs/config-ini.nix
deleted file mode 100644
index b68d4f70b2edebd564b8824acdde8725cf5ef8c8..0000000000000000000000000000000000000000
--- a/pkgs/config-ini.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, directory, hedgehog, ini, lib
-, megaparsec, text, transformers, unordered-containers
-}:
-mkDerivation {
-  pname = "config-ini";
-  version = "0.2.5.0";
-  sha256 = "6f7ce53c22392b5b41e3c0a9853e4183c3bbcb18010f9630f48a90f69bbf6f1f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers megaparsec text transformers unordered-containers
-  ];
-  testHaskellDepends = [
-    base containers directory hedgehog ini text unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/aisamanra/config-ini";
-  description = "A library for simple INI-based configuration files";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/connection.nix b/pkgs/connection.nix
index 1a3d28308b86a58d008b6790fa2eec3db33f3188..676571c1d01e80cd4a05de3ebbe7449caaeaa73d 100644
--- a/pkgs/connection.nix
+++ b/pkgs/connection.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "connection";
   version = "0.3.1";
   sha256 = "5d759589c532c34d87bfc4f6fcb732bf55b55a93559d3b94229e8347a15375d9";
-  revision = "1";
-  editedCabalFile = "08f1n38zryd0jklyv3yillilp040zxfxha6jphrmf28haq2irnk5";
+  revision = "2";
+  editedCabalFile = "1z6v1mhq3wvkbbvhaazlxli3d494iarsqvbx4qwx6xqn1pqz5jrx";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/constraints.nix b/pkgs/constraints.nix
deleted file mode 100644
index c30ac1fd4dab516d549a4486b334d93aec697aee..0000000000000000000000000000000000000000
--- a/pkgs/constraints.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
-, hspec-discover, lib, mtl, transformers, transformers-compat
-, type-equality
-}:
-mkDerivation {
-  pname = "constraints";
-  version = "0.13.4";
-  sha256 = "4186946df4b88c5d7cae3a42aa426f30fd5d249835ea1d290e139cebbf464434";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary deepseq ghc-prim hashable mtl transformers
-    transformers-compat type-equality
-  ];
-  testHaskellDepends = [ base hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/constraints/";
-  description = "Constraint manipulation";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/contravariant-extras.nix b/pkgs/contravariant-extras.nix
index 20d34a3e93cae537ca4b831c17a8a987657eb27b..2303286d71aad5d273d48f41d26d6268bbb81916 100644
--- a/pkgs/contravariant-extras.nix
+++ b/pkgs/contravariant-extras.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "contravariant-extras";
-  version = "0.3.5.3";
-  sha256 = "6a85370aba6dbebfde46a0029039ef329fc1e118794a67a021ed9bf808b58b64";
+  version = "0.3.5.4";
+  sha256 = "2f3a16d38cb6778704db7f142e54be169db4362e033b2d568c172d0c6e64298e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/contravariant.nix b/pkgs/contravariant.nix
deleted file mode 100644
index de71ca2a84e4ade39de5966174efb4d74fbcca07..0000000000000000000000000000000000000000
--- a/pkgs/contravariant.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, StateVar, base, lib, transformers }:
-mkDerivation {
-  pname = "contravariant";
-  version = "1.5.5";
-  sha256 = "062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base StateVar transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/contravariant/";
-  description = "Contravariant functors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cookie.nix b/pkgs/cookie.nix
deleted file mode 100644
index 83a6b0dd68e35787da56d86becb6255a8b9c2d2b..0000000000000000000000000000000000000000
--- a/pkgs/cookie.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring
-, data-default-class, deepseq, lib, tasty, tasty-hunit
-, tasty-quickcheck, text, time
-}:
-mkDerivation {
-  pname = "cookie";
-  version = "0.4.6";
-  sha256 = "8c41a956c32b9733d525a53d43b0338a236a34d36658ecc4364c8249a6664baa";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring data-default-class deepseq text time
-  ];
-  testHaskellDepends = [
-    base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-    text time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/snoyberg/cookie";
-  description = "HTTP cookie parsing and rendering";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/criterion-measurement.nix b/pkgs/criterion-measurement.nix
deleted file mode 100644
index a8527721ebe9c9ecdaddc23258f2ab4cc8740f66..0000000000000000000000000000000000000000
--- a/pkgs/criterion-measurement.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, aeson, base, base-compat, binary, containers
-, deepseq, ghc-prim, lib, vector
-}:
-mkDerivation {
-  pname = "criterion-measurement";
-  version = "0.2.1.0";
-  sha256 = "ddce822e11be48a56ac1cb3c752847ac5fe04743728268207482aee8713eeda5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base base-compat binary containers deepseq ghc-prim vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/criterion";
-  description = "Criterion measurement functionality and associated types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/criterion.nix b/pkgs/criterion.nix
index 25005306cff621a0e57c103c0b5b9f820e566891..c9168567cbf51a06d1ef2d992b45e5a443a93f0d 100644
--- a/pkgs/criterion.nix
+++ b/pkgs/criterion.nix
@@ -1,27 +1,26 @@
-{ mkDerivation, Glob, HUnit, QuickCheck, aeson, ansi-wl-pprint
-, base, base-compat, base-compat-batteries, binary, binary-orphans
-, bytestring, cassava, code-page, containers, criterion-measurement
-, deepseq, directory, exceptions, filepath, js-chart, lib
-, microstache, mtl, mwc-random, optparse-applicative, parsec
-, statistics, tasty, tasty-hunit, tasty-quickcheck, text, time
-, transformers, transformers-compat, vector, vector-algorithms
+{ mkDerivation, Glob, HUnit, QuickCheck, aeson, base, base-compat
+, base-compat-batteries, binary, binary-orphans, bytestring
+, cassava, code-page, containers, criterion-measurement, deepseq
+, directory, exceptions, filepath, js-chart, lib, microstache, mtl
+, mwc-random, optparse-applicative, parsec, prettyprinter
+, prettyprinter-ansi-terminal, statistics, tasty, tasty-hunit
+, tasty-quickcheck, text, time, transformers, transformers-compat
+, vector, vector-algorithms
 }:
 mkDerivation {
   pname = "criterion";
-  version = "1.6.0.0";
-  sha256 = "4029ef9ccd158e995a97827bb50d189a98a0875ea4b73300276fac1510a252b0";
-  revision = "1";
-  editedCabalFile = "1sq1izskw1j1dxrdak8zxv22q3cvxg7s9wvxx3l2gj0165xj83bc";
+  version = "1.6.3.0";
+  sha256 = "c31711e2596adf0c46b2451a151357d28633b1bc1a430070758ef3d49ede9ba2";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson ansi-wl-pprint base base-compat-batteries binary
-    binary-orphans bytestring cassava code-page containers
-    criterion-measurement deepseq directory exceptions filepath Glob
-    js-chart microstache mtl mwc-random optparse-applicative parsec
-    statistics text time transformers transformers-compat vector
-    vector-algorithms
+    aeson base base-compat-batteries binary binary-orphans bytestring
+    cassava code-page containers criterion-measurement deepseq
+    directory exceptions filepath Glob js-chart microstache mtl
+    mwc-random optparse-applicative parsec prettyprinter
+    prettyprinter-ansi-terminal statistics text time transformers
+    transformers-compat vector vector-algorithms
   ];
   executableHaskellDepends = [
     base base-compat-batteries optparse-applicative
diff --git a/pkgs/crypto-api-tests.nix b/pkgs/crypto-api-tests.nix
deleted file mode 100644
index ac91553cf6c3829de04c7ac31cba04ad3177be75..0000000000000000000000000000000000000000
--- a/pkgs/crypto-api-tests.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, cereal
-, crypto-api, directory, filepath, lib, test-framework
-, test-framework-hunit, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "crypto-api-tests";
-  version = "0.3";
-  sha256 = "f44aecdd4ceb9da9f38330e84d9c17745a82b0611085ebb34442d2dce4207270";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    base bytestring cereal crypto-api directory filepath HUnit
-    QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://trac.haskell.org/crypto-api/wiki";
-  description = "A test framework and KATs for cryptographic operations";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/crypto-api.nix b/pkgs/crypto-api.nix
deleted file mode 100644
index 0907cdb66cee61efaad4a9a0da93c5c276a38ffb..0000000000000000000000000000000000000000
--- a/pkgs/crypto-api.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, cereal, entropy, lib, tagged
-, transformers
-}:
-mkDerivation {
-  pname = "crypto-api";
-  version = "0.13.3";
-  sha256 = "298a9ea7ce97c8ccf4bfe46d4864092c3a007a56bede73560070db3bf1ac7aa5";
-  revision = "1";
-  editedCabalFile = "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring cereal entropy tagged transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/TomMD/crypto-api";
-  description = "A generic interface for cryptographic operations";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cryptohash-md5.nix b/pkgs/cryptohash-md5.nix
index 11d5eab036792e56b0ca22468cadb6f99588194e..6d3bc5cdf99dd91e68f11cc88971fb4d430bc985 100644
--- a/pkgs/cryptohash-md5.nix
+++ b/pkgs/cryptohash-md5.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "cryptohash-md5";
   version = "0.11.101.0";
   sha256 = "3b08db0ae39df2b44e83053ad30d7546a4c6200a852c22a240a7e03ae1080f05";
-  revision = "2";
-  editedCabalFile = "112lx16przdk80m269rqizma0lxaij52l4haspb0cd07rbgp50cd";
+  revision = "3";
+  editedCabalFile = "1v7gv0xa9yfkxq3g9j79ppzn6hjf467aajzb4x5882yflibfi9ki";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/cryptohash-sha1.nix b/pkgs/cryptohash-sha1.nix
index b5cde339cad0653d6d69954c732f4bbf6c0ccc7f..0c0b733a638872a5820d06f92bb9824510981978 100644
--- a/pkgs/cryptohash-sha1.nix
+++ b/pkgs/cryptohash-sha1.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "cryptohash-sha1";
   version = "0.11.101.0";
   sha256 = "a4042c97ad02eb68e766577ca35c01970c33e96cfd74ccb4dd403e3476a23241";
-  revision = "2";
-  editedCabalFile = "1v495qn836flf4nhn43sbq14bhqfljvcpncmfrnvkhbrp5drxgi5";
+  revision = "3";
+  editedCabalFile = "08f68cjmdrwx76id4hcyp3jxs8dsnb1jv9pfkm5x7gsvxmrk6pdw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/cryptohash-sha256.nix b/pkgs/cryptohash-sha256.nix
deleted file mode 100644
index 3b70b175830fa1719e91de0e8c7ddf51ad7ab964..0000000000000000000000000000000000000000
--- a/pkgs/cryptohash-sha256.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, SHA, base, base16-bytestring, bytestring, criterion
-, lib, tasty, tasty-hunit, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "cryptohash-sha256";
-  version = "0.11.102.1";
-  sha256 = "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6";
-  revision = "2";
-  editedCabalFile = "1g7lpcn3zhrp4a65gj71v2164387r0m42pyavlx6bbifhyar1kkj";
-  configureFlags = [ "-fuse-cbits" ];
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [
-    base base16-bytestring bytestring SHA tasty tasty-hunit
-    tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [ base bytestring criterion SHA ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hvr/cryptohash-sha256";
-  description = "Fast, pure and practical SHA-256 implementation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cryptohash.nix b/pkgs/cryptohash.nix
deleted file mode 100644
index 1ab86b5c5f9c8af3eefaa78df070739511b57f38..0000000000000000000000000000000000000000
--- a/pkgs/cryptohash.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, byteable, bytestring
-, criterion, cryptonite, ghc-prim, lib, memory, tasty, tasty-hunit
-, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "cryptohash";
-  version = "0.11.9";
-  sha256 = "c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base byteable bytestring cryptonite ghc-prim memory
-  ];
-  testHaskellDepends = [
-    base byteable bytestring HUnit QuickCheck tasty tasty-hunit
-    tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [ base byteable bytestring criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-cryptohash";
-  description = "collection of crypto hashes, fast, pure and practical";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cryptonite.nix b/pkgs/cryptonite.nix
deleted file mode 100644
index db9ebc591b98b4b651c8ac121c4c5368274d3138..0000000000000000000000000000000000000000
--- a/pkgs/cryptonite.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, base, basement, bytestring, deepseq, gauge
-, ghc-prim, integer-gmp, lib, memory, random, tasty, tasty-hunit
-, tasty-kat, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "cryptonite";
-  version = "0.30";
-  sha256 = "56099c8a8aa01d2ee914b670c97c1f818186dbb886e2025b73d9c2afe3496b1d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base basement bytestring deepseq ghc-prim integer-gmp memory
-  ];
-  testHaskellDepends = [
-    base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring deepseq gauge memory random
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-crypto/cryptonite";
-  description = "Cryptography Primitives sink";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/csv.nix b/pkgs/csv.nix
deleted file mode 100644
index cf1cb9109946c803e2649a2edd3a6b9b7afc7626..0000000000000000000000000000000000000000
--- a/pkgs/csv.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, fetchgit, filepath, lib, parsec }:
-mkDerivation {
-  pname = "csv";
-  version = "0.1.2";
-  src = fetchgit {
-    url = "https://gitlab.homotopic.tech/horizon/adopted/csv";
-    sha256 = "1idv0500imfvi6wzz3g7v89irz9g20plsphp51aa0xksz7ifj34b";
-    rev = "d02b89bbad79136b52fd1197f087466cf51573dd";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base filepath parsec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "CSV loader and dumper";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/cubicbezier.nix b/pkgs/cubicbezier.nix
index a096d09cb4de886c225cc5b5ab2c0e4ba233b9f7..163a9cd69fdd5fa74c5f6e5ec59dbe83f89e117d 100644
--- a/pkgs/cubicbezier.nix
+++ b/pkgs/cubicbezier.nix
@@ -4,10 +4,8 @@
 }:
 mkDerivation {
   pname = "cubicbezier";
-  version = "0.6.0.6";
-  sha256 = "5a73fcde2b92ce138d924c323f04f48427acbfdc2c774ff0f032a10ea60afa68";
-  revision = "1";
-  editedCabalFile = "084inqa0mpm6m958fmjwsnn2fn46mcdpfin482mzs5fk6c9fwywl";
+  version = "0.6.0.7";
+  sha256 = "e2e85e0cc78c2b65858bcd969d58bf36f1cd8e59531d361b6d710073939846e5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/data-clist.nix b/pkgs/data-clist.nix
deleted file mode 100644
index b71611fc4555fe43afd4dc4e5549c212a117d96c..0000000000000000000000000000000000000000
--- a/pkgs/data-clist.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, lib }:
-mkDerivation {
-  pname = "data-clist";
-  version = "0.2";
-  sha256 = "1c3a1ebd71e8f6fe30afdb3797c4852db7fb0b4e3c145fc53e8282eb4303b212";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  testHaskellDepends = [ base QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sw17ch/data-clist";
-  description = "Simple functional ring type";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-default-class.nix b/pkgs/data-default-class.nix
deleted file mode 100644
index ab5fb3fc1c0a76dfb40127b9364c269740745cbf..0000000000000000000000000000000000000000
--- a/pkgs/data-default-class.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "data-default-class";
-  version = "0.1.2.0";
-  sha256 = "4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A class for types with a default value";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-containers.nix b/pkgs/data-default-instances-containers.nix
deleted file mode 100644
index c513bcc277e498170b5a833becc8a8c3ea1dd7da..0000000000000000000000000000000000000000
--- a/pkgs/data-default-instances-containers.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, containers, data-default-class, lib }:
-mkDerivation {
-  pname = "data-default-instances-containers";
-  version = "0.0.1";
-  sha256 = "a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers data-default-class ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Default instances for types in containers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-dlist.nix b/pkgs/data-default-instances-dlist.nix
deleted file mode 100644
index dee9d318a14df166d7e268ec8cbc0fbf5a387b41..0000000000000000000000000000000000000000
--- a/pkgs/data-default-instances-dlist.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, data-default-class, dlist, lib }:
-mkDerivation {
-  pname = "data-default-instances-dlist";
-  version = "0.0.1";
-  sha256 = "7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base data-default-class dlist ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Default instances for types in dlist";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-old-locale.nix b/pkgs/data-default-instances-old-locale.nix
deleted file mode 100644
index de12c0a0a6c949f203f97558d600e8c56d3774db..0000000000000000000000000000000000000000
--- a/pkgs/data-default-instances-old-locale.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, data-default-class, lib, old-locale }:
-mkDerivation {
-  pname = "data-default-instances-old-locale";
-  version = "0.0.1";
-  sha256 = "60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base data-default-class old-locale ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Default instances for types in old-locale";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-default.nix b/pkgs/data-default.nix
deleted file mode 100644
index adb8e06b8e944383e89e204c100ebd2a05440144..0000000000000000000000000000000000000000
--- a/pkgs/data-default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, data-default-class
-, data-default-instances-containers, data-default-instances-dlist
-, data-default-instances-old-locale, lib
-}:
-mkDerivation {
-  pname = "data-default";
-  version = "0.7.1.1";
-  sha256 = "b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base data-default-class data-default-instances-containers
-    data-default-instances-dlist data-default-instances-old-locale
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A class for types with a default value";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/data-fix.nix b/pkgs/data-fix.nix
deleted file mode 100644
index acb300311dd375b6b5638508445c2159060b3d0e..0000000000000000000000000000000000000000
--- a/pkgs/data-fix.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, deepseq, hashable, lib }:
-mkDerivation {
-  pname = "data-fix";
-  version = "0.3.2";
-  sha256 = "3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc";
-  revision = "4";
-  editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq hashable ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/spell-music/data-fix";
-  description = "Fixpoint data types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dbus.nix b/pkgs/dbus.nix
index c51ab77973195b6c773680d7e8b7671b7dde0777..26224973624e62ea62d9e17495f5134547c2a745 100644
--- a/pkgs/dbus.nix
+++ b/pkgs/dbus.nix
@@ -2,12 +2,13 @@
 , containers, criterion, deepseq, directory, exceptions, extra
 , filepath, lens, lib, network, parsec, process, random, resourcet
 , split, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-, text, th-lift, transformers, unix, vector, xml-conduit, xml-types
+, temporary, text, th-lift, transformers, unix, vector, xml-conduit
+, xml-types
 }:
 mkDerivation {
   pname = "dbus";
-  version = "1.2.28";
-  sha256 = "7c13a768f396975d228188465a7683efa9253ab792cde0da1662171487654a48";
+  version = "1.3.1";
+  sha256 = "a36eb77ac789cb3ed3b8873387cd9268ba9d3605c56498b69d0fae869f876f58";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,7 +20,7 @@ mkDerivation {
   testHaskellDepends = [
     base bytestring cereal containers directory extra filepath network
     parsec process QuickCheck random resourcet tasty tasty-hunit
-    tasty-quickcheck text transformers unix vector
+    tasty-quickcheck temporary text transformers unix vector
   ];
   benchmarkHaskellDepends = [ base criterion ];
   enableLibraryProfiling = true;
diff --git a/pkgs/dec.nix b/pkgs/dec.nix
deleted file mode 100644
index 954a14192910e8532e26e11d8869488153e88579..0000000000000000000000000000000000000000
--- a/pkgs/dec.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, boring, lib }:
-mkDerivation {
-  pname = "dec";
-  version = "0.0.5";
-  sha256 = "e18043c7c7e68168489f164921a02efede0c0175a5012ed5451ec2242338df88";
-  revision = "1";
-  editedCabalFile = "1vng67drg2y9vjg6106q4lcz0kf2f2kl4qrrnl76kmk6z9a9kakh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base boring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/dec";
-  description = "Decidable propositions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/deepseq-generics.nix b/pkgs/deepseq-generics.nix
index 835d17f5885d3818a7f79289173023b1a3290323..1bf8504033ce8643ff29f46529fc375756eee896 100644
--- a/pkgs/deepseq-generics.nix
+++ b/pkgs/deepseq-generics.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "deepseq-generics";
   version = "0.2.0.0";
   sha256 = "b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d";
-  revision = "9";
-  editedCabalFile = "1ww3328aga9s7knbl8xxvsff13gdnl3rdqplpx11rl6k6gnr032k";
+  revision = "10";
+  editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/deferred-folds.nix b/pkgs/deferred-folds.nix
index d3b06c520cb2378546c44a92ee59900e3b62bf88..01024f86cf3e529b525a056edc8acfe67d80a275 100644
--- a/pkgs/deferred-folds.nix
+++ b/pkgs/deferred-folds.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, QuickCheck, base, bytestring, containers, foldl
-, hashable, lib, primitive, quickcheck-instances, rerebase, tasty
-, tasty-hunit, tasty-quickcheck, text, transformers
-, unordered-containers, vector
+{ mkDerivation, base, bytestring, containers, foldl, hashable, lib
+, primitive, quickcheck-instances, rerebase, tasty
+, tasty-quickcheck, text, transformers, unordered-containers
+, vector
 }:
 mkDerivation {
   pname = "deferred-folds";
-  version = "0.9.18.3";
-  sha256 = "3b2130eaa080d199380ad6a139c4eb8198ccc9291b5878dcb5aeb15b19f64774";
+  version = "0.9.18.5";
+  sha256 = "c44e569d79349715cbb32a2958f603084ffec7c099a179313beb206be7fb2ce6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,8 +15,7 @@ mkDerivation {
     transformers unordered-containers vector
   ];
   testHaskellDepends = [
-    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-    tasty-quickcheck
+    quickcheck-instances rerebase tasty tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/dependent-sum-template.nix b/pkgs/dependent-sum-template.nix
index 88e83df68e33e8ebcf59e996bb833ca06c27061f..7b5e4bd3fd2de51324d541cc3da10fa8e94e09c9 100644
--- a/pkgs/dependent-sum-template.nix
+++ b/pkgs/dependent-sum-template.nix
@@ -1,17 +1,19 @@
-{ mkDerivation, base, constraints-extras, dependent-sum, lib
-, template-haskell, th-abstraction, th-extras
+{ mkDerivation, base, constraints-extras, containers, lib, mtl
+, some, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "dependent-sum-template";
-  version = "0.1.1.1";
-  sha256 = "d46fc18d5c2f5d385f901777e982e8a1ae9094ba7e68f7e4997a82036375ae0f";
+  version = "0.2.0.0";
+  sha256 = "c9632d831c33a81863cb2102943cee58ffa0287c1777facc577da0aab93f5a81";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base dependent-sum template-haskell th-abstraction th-extras
+    base containers mtl some template-haskell th-abstraction
+  ];
+  testHaskellDepends = [
+    base constraints-extras some template-haskell th-abstraction
   ];
-  testHaskellDepends = [ base constraints-extras dependent-sum ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -19,8 +21,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/obsidiansystems/dependent-sum";
-  description = "Template Haskell code to generate instances of classes in dependent-sum package";
+  homepage = "https://github.com/obsidiansystems/dependent-sum-template";
+  description = "Template Haskell code to generate instances of classes in some package";
   license = lib.licenses.publicDomain;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/deriving-aeson.nix b/pkgs/deriving-aeson.nix
index 8cc640943ceb3d53b433a152db524545d01d29ef..c50c47cdb04fba78a1ef9ae6ec5d43be01c7e9d7 100644
--- a/pkgs/deriving-aeson.nix
+++ b/pkgs/deriving-aeson.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "deriving-aeson";
   version = "0.2.9";
   sha256 = "c0b2975df7ed5ba668982ba442318c36adfe8be3c32dcf136c13bf9662261833";
+  revision = "1";
+  editedCabalFile = "14iqkk7vs0lb0sgq159z0xw95pa87r60i1f4m17gfh2gbbddcywm";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/deriving-compat.nix b/pkgs/deriving-compat.nix
index f74d2c8115c022de9eb7a257ff607a5d7fffa4bd..d7aa759902dee28b833ac70bf9bdabbda95888e6 100644
--- a/pkgs/deriving-compat.nix
+++ b/pkgs/deriving-compat.nix
@@ -5,8 +5,10 @@
 }:
 mkDerivation {
   pname = "deriving-compat";
-  version = "0.6.3";
-  sha256 = "b1bf97012db9012a74af4b13cb3454afb7afa1db54c0f6e4bd7c10349e66692a";
+  version = "0.6.5";
+  sha256 = "47412ecf53461a43d4cc2b705cbc9bb4a958bff7b9008a2582c26b73df5532f3";
+  revision = "1";
+  editedCabalFile = "093kv76593jr1af12c5idqr97mbkf9vs93zbhrw7kcqwiydpsi91";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/derp.nix b/pkgs/derp.nix
deleted file mode 100644
index b0932e634f3c76dddc2d430ad6df4de844399ce1..0000000000000000000000000000000000000000
--- a/pkgs/derp.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, containers, lib }:
-mkDerivation {
-  pname = "derp";
-  version = "0.1.6";
-  sha256 = "136a001ad5afc5db65495832a539ab027e2685ce5f6ed82d5fb72a29314a1e3d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Derivative Parsing";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dhall-docs.nix b/pkgs/dhall-docs.nix
index 8196bd4362fe6b2a1cd9c22789728c2d314b4a6b..0b5519faa86c787b4f04816a48514a0efc0f63ca 100644
--- a/pkgs/dhall-docs.nix
+++ b/pkgs/dhall-docs.nix
@@ -6,10 +6,8 @@
 }:
 mkDerivation {
   pname = "dhall-docs";
-  version = "1.0.10";
-  sha256 = "4257d1a4fb06f5c98dbef7d39b420e7c52db9f966cc1c5f4da13d9286bb706e6";
-  revision = "3";
-  editedCabalFile = "06pjafliw9a3pzw9846yb9rmsjrwrn7jhax7s2bsdasx5agdrfg5";
+  version = "1.0.11";
+  sha256 = "984aa37da15a393b7009c17bf0c9f55819446dc2f82e5b0faf654f71c5ff2c45";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
diff --git a/pkgs/dhall-json.nix b/pkgs/dhall-json.nix
index e9c415c561235716bacb45d201780b28bb218440..522c7a0051896ca382878fc40c4198f334500fef 100644
--- a/pkgs/dhall-json.nix
+++ b/pkgs/dhall-json.nix
@@ -6,10 +6,10 @@
 }:
 mkDerivation {
   pname = "dhall-json";
-  version = "1.7.11";
-  sha256 = "26c2acf33bfc597f4d2ac333a431180c9929d7a9b4ef7cf70c4bd45eba65ef28";
+  version = "1.7.12";
+  sha256 = "ca48cd434380cbd979dbb12889f90da8fdc1ea90bc266cab14f061c60e19d5fa";
   revision = "1";
-  editedCabalFile = "0m5sngc1j7jagn95qmjz7gpw2jgqnnafgr6nwd506q8z2jg2a3my";
+  editedCabalFile = "0rf3zlr75x6g4hl1759j21fnnrp21shc7a35x7c73a0xyzpviqqi";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/dhall-nixpkgs.nix b/pkgs/dhall-nixpkgs.nix
index fd77fed2830f272e5725ba976114f32b9a59d011..36d067218f9cc391d92de302495cbb6e28a467e2 100644
--- a/pkgs/dhall-nixpkgs.nix
+++ b/pkgs/dhall-nixpkgs.nix
@@ -5,10 +5,8 @@
 }:
 mkDerivation {
   pname = "dhall-nixpkgs";
-  version = "1.0.9";
-  sha256 = "a31c656973f30ddf4d750db75fa351d89a38e7a3937743a8f8f0d71f211611c8";
-  revision = "1";
-  editedCabalFile = "0140jhwf5mz9i5k1v0mbljhr77rgfvhbs5s3ak9naagnxszy725j";
+  version = "1.0.10";
+  sha256 = "a5d672ac4bb86e149c8f324fd4d99e65ce30dc742d3e3bfab86329acb5fbe126";
   isLibrary = false;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/dhall.nix b/pkgs/dhall.nix
deleted file mode 100644
index 2ef77772db1b6549924e19bae62a16440cb2d8ca..0000000000000000000000000000000000000000
--- a/pkgs/dhall.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ mkDerivation, Diff, QuickCheck, aeson, aeson-pretty
-, ansi-terminal, atomic-write, base, base16-bytestring, bytestring
-, case-insensitive, cborg, cborg-json, containers, contravariant
-, cryptohash-sha256, data-fix, deepseq, directory, doctest, dotgen
-, either, exceptions, filepath, foldl, gauge, generic-random, half
-, hashable, haskeline, http-client, http-client-tls, http-types
-, indexed-traversable, lens-family-core, lib, megaparsec, mmorph
-, mockery, mtl, network-uri, optparse-applicative
-, parser-combinators, parsers, pretty-simple, prettyprinter
-, prettyprinter-ansi-terminal, profunctors, quickcheck-instances
-, repline, scientific, serialise, special-values, spoon
-, system-filepath, tasty, tasty-expected-failure, tasty-hunit
-, tasty-quickcheck, tasty-silver, template-haskell, temporary, text
-, text-manipulate, text-short, th-lift-instances, time
-, transformers, turtle, unordered-containers, uri-encode, vector
-}:
-mkDerivation {
-  pname = "dhall";
-  version = "1.41.2";
-  sha256 = "6a9a026e698e5c1a1e103fcb376e8494615b03ef2450f0b6c5e6b43877cea592";
-  revision = "5";
-  editedCabalFile = "0jhhwzzinlxyb2gxr2jcyr71mbdig7njkw2zi8znns1ik6ix0d4c";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty ansi-terminal atomic-write base
-    base16-bytestring bytestring case-insensitive cborg cborg-json
-    containers contravariant cryptohash-sha256 data-fix deepseq Diff
-    directory dotgen either exceptions filepath half hashable haskeline
-    http-client http-client-tls http-types indexed-traversable
-    lens-family-core megaparsec mmorph mtl network-uri
-    optparse-applicative parser-combinators parsers pretty-simple
-    prettyprinter prettyprinter-ansi-terminal profunctors repline
-    scientific serialise template-haskell text text-manipulate
-    text-short th-lift-instances time transformers unordered-containers
-    uri-encode vector
-  ];
-  executableHaskellDepends = [
-    aeson aeson-pretty ansi-terminal atomic-write base
-    base16-bytestring bytestring case-insensitive cborg cborg-json
-    containers contravariant data-fix deepseq Diff directory dotgen
-    either exceptions filepath half hashable haskeline
-    indexed-traversable lens-family-core megaparsec mmorph mtl
-    network-uri optparse-applicative parser-combinators parsers
-    pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
-    repline scientific serialise template-haskell text text-manipulate
-    text-short th-lift-instances time transformers unordered-containers
-    uri-encode vector
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty ansi-terminal atomic-write base
-    base16-bytestring bytestring case-insensitive cborg cborg-json
-    containers contravariant data-fix deepseq Diff directory doctest
-    dotgen either exceptions filepath foldl generic-random half
-    hashable haskeline http-client http-client-tls indexed-traversable
-    lens-family-core megaparsec mmorph mockery mtl network-uri
-    optparse-applicative parser-combinators parsers pretty-simple
-    prettyprinter prettyprinter-ansi-terminal profunctors QuickCheck
-    quickcheck-instances repline scientific serialise special-values
-    spoon system-filepath tasty tasty-expected-failure tasty-hunit
-    tasty-quickcheck tasty-silver template-haskell temporary text
-    text-manipulate text-short th-lift-instances time transformers
-    turtle unordered-containers uri-encode vector
-  ];
-  benchmarkHaskellDepends = [
-    aeson aeson-pretty ansi-terminal atomic-write base
-    base16-bytestring bytestring case-insensitive cborg cborg-json
-    containers contravariant data-fix deepseq Diff directory dotgen
-    either exceptions filepath gauge half hashable haskeline
-    indexed-traversable lens-family-core megaparsec mmorph mtl
-    network-uri optparse-applicative parser-combinators parsers
-    pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
-    repline scientific serialise template-haskell text text-manipulate
-    text-short th-lift-instances time transformers unordered-containers
-    uri-encode vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A configuration language guaranteed to terminate";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/diagrams-contrib.nix b/pkgs/diagrams-contrib.nix
index 617dfe0ee070b59104e122dfe643bf23084ec167..1362423b7966f48c0b2e8ba2a9a656a425554048 100644
--- a/pkgs/diagrams-contrib.nix
+++ b/pkgs/diagrams-contrib.nix
@@ -8,10 +8,8 @@
 }:
 mkDerivation {
   pname = "diagrams-contrib";
-  version = "1.4.5";
-  sha256 = "900baf9c40a36b637400bb58dbab260d3b654a1249809153c4fdd6ec2152286c";
-  revision = "1";
-  editedCabalFile = "0i5s9mr88kc68v2wc07jpdy2hzqh2gc1dsawvb2sracnqmv9q658";
+  version = "1.4.5.1";
+  sha256 = "cbb799ac8c46e2c3ad7af1f70d62e12838148a833ba3ec9f168bdd53d3151772";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/diagrams-lib.nix b/pkgs/diagrams-lib.nix
index 650c260869abae52e54cd90f35728ee97b5af484..6984cd34dc9bc4d40ca4bee40f45b40eb84bca8a 100644
--- a/pkgs/diagrams-lib.nix
+++ b/pkgs/diagrams-lib.nix
@@ -1,7 +1,7 @@
 { mkDerivation, JuicyPixels, QuickCheck, active, adjunctions, array
 , base, bytestring, cereal, colour, containers, criterion
 , data-default-class, deepseq, diagrams-core, diagrams-solve
-, directory, distributive, dual-tree, exceptions, filepath
+, directory, distributive, dual-tree, exceptions, fail, filepath
 , fingertree, fsnotify, hashable, intervals, lens, lib, linear
 , monoid-extras, mtl, numeric-extras, optparse-applicative, process
 , profunctors, semigroups, tagged, tasty, tasty-hunit
@@ -9,17 +9,17 @@
 }:
 mkDerivation {
   pname = "diagrams-lib";
-  version = "1.4.5.3";
-  sha256 = "2c9eb84b4b3c9f23f01a24cdae24d49c2eccb39bb50c90475ffa119ad813e640";
+  version = "1.4.6";
+  sha256 = "8bc92bdc50a654bfd59748f25dfa317a1d817b503cc8427af16bf2ab29a21ca8";
   revision = "3";
-  editedCabalFile = "10m1nh6swfh4jvky2mx692g0jp1xk1cym9gvzljmmni3pf41mzsf";
+  editedCabalFile = "09b3hdmsk5byjm1jcq03zjb8fz7h3lid747abi3fq9bvsaqsp5ka";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     active adjunctions array base bytestring cereal colour containers
     data-default-class diagrams-core diagrams-solve directory
-    distributive dual-tree exceptions filepath fingertree fsnotify
+    distributive dual-tree exceptions fail filepath fingertree fsnotify
     hashable intervals JuicyPixels lens linear monoid-extras mtl
     optparse-applicative process profunctors semigroups tagged text
     transformers unordered-containers
diff --git a/pkgs/diagrams-postscript.nix b/pkgs/diagrams-postscript.nix
index 3d50c4a59b36228411326e4507319412310453ca..5886d5a7572ca5efb33cb35ba7fd992595b1b731 100644
--- a/pkgs/diagrams-postscript.nix
+++ b/pkgs/diagrams-postscript.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "diagrams-postscript";
   version = "1.5.1.1";
   sha256 = "842afeee6f4895d9b3d49d21118428c1f85594a76fbf89d84b2ee23101088bcf";
+  revision = "1";
+  editedCabalFile = "0h6wkzncxcz8pjqqr696y3m6d3xbsm5n5d5r4pfx7b81kq53l6x8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/diagrams-solve.nix b/pkgs/diagrams-solve.nix
index 1f6b80f1403001fcd087b8abdf6dcde4cb8eb0b4..a074d789f2afbf95901faba07759e065d20abd3f 100644
--- a/pkgs/diagrams-solve.nix
+++ b/pkgs/diagrams-solve.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "diagrams-solve";
   version = "0.1.3";
   sha256 = "27b4bba55f5c2aae94903fbe7958f27744c0ff6a805ceb8a046ab4bd36e31827";
-  revision = "1";
-  editedCabalFile = "0dp61igq17l7hvhs3167skdi1vmlm773qrrmsqmj08951l4cgv0h";
+  revision = "2";
+  editedCabalFile = "08l6q5751lrpyrjiliig94a2s7ahlm2045bp5mngnl9nf6xr1rwb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/diagrams-svg.nix b/pkgs/diagrams-svg.nix
index ccfe7d72106da2a3738af75893aeb4d4521c283b..eda08570e98353833318f8aa2fc906674d2ebf3b 100644
--- a/pkgs/diagrams-svg.nix
+++ b/pkgs/diagrams-svg.nix
@@ -7,8 +7,8 @@ mkDerivation {
   pname = "diagrams-svg";
   version = "1.4.3.1";
   sha256 = "67080a0aa846f2931c14855560c4bbd848c44935f5ada4dbd6d93074707d5400";
-  revision = "4";
-  editedCabalFile = "026mkj9fz64rdrap25mp8cwdrzwj90h35qg9kkn078fac93aaq10";
+  revision = "5";
+  editedCabalFile = "00hjvv9ncf5il7a09g2gh45bwah4jbnfnhb523jz9lhqqbzxfxny";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/digest.nix b/pkgs/digest.nix
index 6b9c7f146efa4526feb7f8dfc996abcedb5e4314..9fe7ecca7ce9e249b5c5cb77d9b1f7bf07070da8 100644
--- a/pkgs/digest.nix
+++ b/pkgs/digest.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "digest";
   version = "0.0.1.7";
   sha256 = "b23d6c804e6fed0ac9bb0d35b7aed5785330d63efebe296cf0073dab17e05f0a";
+  revision = "1";
+  editedCabalFile = "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/split.nix b/pkgs/digits.nix
similarity index 63%
rename from pkgs/split.nix
rename to pkgs/digits.nix
index a777926ca60ef0fe9c5e060889b603feea9d8e28..59d37544c6ebf0f9d5a1f9026efb534f14e65002 100644
--- a/pkgs/split.nix
+++ b/pkgs/digits.nix
@@ -1,12 +1,12 @@
 { mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
-  pname = "split";
-  version = "0.2.3.5";
-  sha256 = "bf8aa8d610354a2b576946a6c838251ec5988c8374100638e6b2604513b93159";
+  pname = "digits";
+  version = "0.3.1";
+  sha256 = "a8499c9745dcf8a4e6c48594f555e6c6276e8d91c457dcc562a370ccadcd6a2c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
+  libraryHaskellDepends = [ base QuickCheck ];
   testHaskellDepends = [ base QuickCheck ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -15,7 +15,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  description = "Combinator library for splitting lists";
+  description = "Converts integers to lists of digits and back";
   license = lib.licenses.bsd3;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/distribution-nixpkgs.nix b/pkgs/distribution-nixpkgs.nix
deleted file mode 100644
index 26926b0d81558bf298526d7588065dbe97a46da9..0000000000000000000000000000000000000000
--- a/pkgs/distribution-nixpkgs.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, Cabal, aeson, base, bytestring, containers, deepseq
-, directory, hspec, language-nix, lens, lib, pretty, process
-}:
-mkDerivation {
-  pname = "distribution-nixpkgs";
-  version = "1.7.0.1";
-  sha256 = "02e623c27ca757006a0c81f33e8aed4c70cbb0c89563a6ba4e96a59ad5515079";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    aeson base bytestring Cabal containers deepseq language-nix lens
-    pretty process
-  ];
-  testHaskellDepends = [
-    aeson base Cabal deepseq directory hspec language-nix lens
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
-  description = "Types and functions to manipulate the Nixpkgs distribution";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/distributive.nix b/pkgs/distributive.nix
deleted file mode 100644
index f45e315331e0c104f6e285337d75ef708b841048..0000000000000000000000000000000000000000
--- a/pkgs/distributive.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, base-orphans, generic-deriving, hspec
-, hspec-discover, lib, tagged, transformers
-}:
-mkDerivation {
-  pname = "distributive";
-  version = "0.6.2.1";
-  sha256 = "d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91";
-  revision = "1";
-  editedCabalFile = "033890dfyd23dh7g7px863l0hr1b881jnhv4kgwaq16a3iagb68g";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base base-orphans tagged transformers ];
-  testHaskellDepends = [ base generic-deriving hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/distributive/";
-  description = "Distributive functors -- Dual to Traversable";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dlist.nix b/pkgs/dlist.nix
deleted file mode 100644
index 0096750b9a98de6e08c236456ad892d88466e106..0000000000000000000000000000000000000000
--- a/pkgs/dlist.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, lib }:
-mkDerivation {
-  pname = "dlist";
-  version = "1.0";
-  sha256 = "173d637328bb173fcc365f30d29ff4a94292a1e0e5558aeb3dfc11de81510115";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  testHaskellDepends = [ base QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/spl/dlist";
-  description = "Difference lists";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dns.nix b/pkgs/dns.nix
index 3b0f312fae96db76cb73852bc94c5a819d468fb4..7e5e51ad9aa918394f8999e90d0dfb2a664693f6 100644
--- a/pkgs/dns.nix
+++ b/pkgs/dns.nix
@@ -1,22 +1,23 @@
 { mkDerivation, QuickCheck, array, async, attoparsec, auto-update
 , base, base16-bytestring, base64-bytestring, bytestring
-, containers, cryptonite, doctest, hourglass, hspec, hspec-discover
-, iproute, lib, mtl, network, psqueues, word8
+, case-insensitive, containers, crypton, hourglass, hspec
+, hspec-discover, iproute, lib, mtl, network, psqueues, word8
 }:
 mkDerivation {
   pname = "dns";
-  version = "4.1.0";
-  sha256 = "45e3ceb2c2b7a3b2a23fd384f84a81fc4b91330f841f54ae62d8e7a411f100d1";
+  version = "4.2.0";
+  sha256 = "c2d3ce5315a89ce2e362877928e5698159c898c29cb97f10506779ba0db497f9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     array async attoparsec auto-update base base16-bytestring
-    base64-bytestring bytestring containers cryptonite hourglass
-    iproute mtl network psqueues
+    base64-bytestring bytestring case-insensitive containers crypton
+    hourglass iproute mtl network psqueues
   ];
   testHaskellDepends = [
-    base bytestring doctest hspec iproute network QuickCheck word8
+    base bytestring case-insensitive hspec iproute network QuickCheck
+    word8
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
diff --git a/pkgs/doctest-exitcode-stdio.nix b/pkgs/doctest-exitcode-stdio.nix
deleted file mode 100644
index 5c391d03a56f89b2607cede22e250c6a75d7f0a5..0000000000000000000000000000000000000000
--- a/pkgs/doctest-exitcode-stdio.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, doctest-lib, lib, semigroups
-, transformers
-}:
-mkDerivation {
-  pname = "doctest-exitcode-stdio";
-  version = "0.0";
-  sha256 = "1dec779d5e67ea46c8b0d69d454e0717383654e87323bdebc2bc0a8cb33f6cbc";
-  revision = "2";
-  editedCabalFile = "0gfnxkbm126m0d4pnqgl5ca6ab8x5p1vpbxjxgz1sxczablsmk5b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base doctest-lib QuickCheck semigroups transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hub.darcs.net/thielema/doctest-exitcode-stdio/";
-  description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/doctest-lib.nix b/pkgs/doctest-lib.nix
deleted file mode 100644
index 412217929d282b27ba2f9b3b4575b984dffcc05d..0000000000000000000000000000000000000000
--- a/pkgs/doctest-lib.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "doctest-lib";
-  version = "0.1";
-  sha256 = "02c6fa934b4ebc1abca1f7346920921969fc5080397efb606ca270d840555cef";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hub.darcs.net/thielema/doctest-lib/";
-  description = "Parts of doctest exposed as library";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/doctest-parallel.nix b/pkgs/doctest-parallel.nix
deleted file mode 100644
index 4c5143ef9adf7ed1ddbd070feb55da1ada35ee1d..0000000000000000000000000000000000000000
--- a/pkgs/doctest-parallel.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, Cabal, Glob, HUnit, QuickCheck, base, base-compat
-, code-page, containers, deepseq, directory, exceptions, filepath
-, ghc, ghc-paths, hspec, hspec-core, lib, mockery, process, random
-, setenv, silently, stringbuilder, syb, template-haskell
-, transformers, unordered-containers
-}:
-mkDerivation {
-  pname = "doctest-parallel";
-  version = "0.3.0.1";
-  sha256 = "21a8c51254b9f95420925812b17b759cadff2c05e1580abb7b885028fa745f9d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat Cabal code-page containers deepseq directory
-    exceptions filepath ghc ghc-paths Glob process random syb
-    template-haskell transformers unordered-containers
-  ];
-  testHaskellDepends = [
-    base base-compat code-page containers deepseq directory exceptions
-    filepath ghc ghc-paths hspec hspec-core HUnit mockery process
-    QuickCheck setenv silently stringbuilder syb transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/martijnbastiaan/doctest-parallel#readme";
-  description = "Test interactive Haskell examples";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/doctest.nix b/pkgs/doctest.nix
index 1f95240cb2f0864852561a0e7d1824f96a87e8e6..35d4e8a7125bf61e9ea19b87fe85159b87f007c7 100644
--- a/pkgs/doctest.nix
+++ b/pkgs/doctest.nix
@@ -1,27 +1,27 @@
-{ mkDerivation, HUnit, QuickCheck, base, base-compat, code-page
-, deepseq, directory, exceptions, filepath, ghc, ghc-paths, hspec
+{ mkDerivation, HUnit, QuickCheck, base, code-page, deepseq
+, directory, exceptions, filepath, ghc, ghc-paths, hspec
 , hspec-core, hspec-discover, lib, mockery, process, setenv
 , silently, stringbuilder, syb, transformers
 }:
 mkDerivation {
   pname = "doctest";
-  version = "0.21.1";
-  sha256 = "6336aa457c541561151b1768ce1ad428bc800dc277bed02caf42aa686e42f46d";
+  version = "0.22.2";
+  sha256 = "afb839c14019c17e3ec7900871a9fc104226028858c724932d53225ae382c6e5";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base base-compat code-page deepseq directory exceptions filepath
-    ghc ghc-paths process syb transformers
+    base code-page deepseq directory exceptions filepath ghc ghc-paths
+    process syb transformers
   ];
   executableHaskellDepends = [
-    base base-compat code-page deepseq directory exceptions filepath
-    ghc ghc-paths process syb transformers
+    base code-page deepseq directory exceptions filepath ghc ghc-paths
+    process syb transformers
   ];
   testHaskellDepends = [
-    base base-compat code-page deepseq directory exceptions filepath
-    ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck
-    setenv silently stringbuilder syb transformers
+    base code-page deepseq directory exceptions filepath ghc ghc-paths
+    hspec hspec-core HUnit mockery process QuickCheck setenv silently
+    stringbuilder syb transformers
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
diff --git a/pkgs/dotgen.nix b/pkgs/dotgen.nix
deleted file mode 100644
index 457600e209ec0c25ad466595e854c672baf138ca..0000000000000000000000000000000000000000
--- a/pkgs/dotgen.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, containers, lib }:
-mkDerivation {
-  pname = "dotgen";
-  version = "0.4.3";
-  sha256 = "da1c78f7daf0470465ce095fd0f3b3e8a4e4744d5b582a0f6e590a32522d96c9";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ku-fpg/dotgen";
-  description = "A simple interface for building .dot graph files.";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/dual-tree.nix b/pkgs/dual-tree.nix
index 1193253b6137ac5fc633c2ad92e75474d79d193e..85502d5470abeb174f25a819a624b34e4bd48f43 100644
--- a/pkgs/dual-tree.nix
+++ b/pkgs/dual-tree.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "dual-tree";
   version = "0.2.3.1";
   sha256 = "d0394b94c312a5ae032ee72d811400e3f435138ea05f7be6a4d019131a19d5a6";
-  revision = "1";
-  editedCabalFile = "0prbgzh1bhgrg6qxp5l2m33f5xcjjjpzbm32xx2rgyi4w1yf3587";
+  revision = "2";
+  editedCabalFile = "1qlrrvw3j9h12nj105aa5ckri5580xgbi16gph70i5w2crmrvphw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/easy-file.nix b/pkgs/easy-file.nix
deleted file mode 100644
index 7591047d5e7ade01df3dd2e8115dae9ecde5da2e..0000000000000000000000000000000000000000
--- a/pkgs/easy-file.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, directory, filepath, lib, tasty, tasty-hunit
-, time, unix
-}:
-mkDerivation {
-  pname = "easy-file";
-  version = "0.2.5";
-  sha256 = "ee0fa0914b3bb3662838a689d7cd23a2785ccbc29def366664f994bc524ff2bb";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base directory filepath time unix ];
-  testHaskellDepends = [ base tasty tasty-hunit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/kazu-yamamoto/easy-file";
-  description = "Cross-platform File handling";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/effectful-core.nix b/pkgs/effectful-core.nix
index b18fc91905399b1e3cb6f4eab3b308d3b663d940..e86d866f30f08da5d7281ae06b4a0e932c60321b 100644
--- a/pkgs/effectful-core.nix
+++ b/pkgs/effectful-core.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "effectful-core";
-  version = "2.2.2.2";
-  sha256 = "58ed41ac7ffb0dd8ad438433c7a510457df691e4a1009b2077cc58226e667afa";
+  version = "2.3.0.0";
+  sha256 = "7b42b7ced91ab62856869a81cacab4700c85d0a3babc010878da05ed7fe33efb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/effectful-th.nix b/pkgs/effectful-th.nix
index c7c471ef15d1758aaa89fae1d06d837c96267b02..a28988ee0e8cc838ca077446fec60fbb0d16d6f9 100644
--- a/pkgs/effectful-th.nix
+++ b/pkgs/effectful-th.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "effectful-th";
   version = "1.0.0.1";
   sha256 = "4ee3882a61a876aa3ca1ab3174347d8442688323f20f30a2d48f54fab4dbaba7";
-  revision = "2";
-  editedCabalFile = "15s8yvxf7sbi1vx5ylnrnxc1b694ndmdac0f5bi8v0cg6sjijkzw";
+  revision = "3";
+  editedCabalFile = "1v0p0rs241xqvqzvcqk3dyx68zyqbdqvfyprc0s4nhxzry8a9ka5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/effectful.nix b/pkgs/effectful.nix
index 0e34165e9081384ea5a5f5bb54ff6754d3b572ec..38cd99dbf6c7fd6f38e79cf6cf7bc574e3dec595 100644
--- a/pkgs/effectful.nix
+++ b/pkgs/effectful.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "effectful";
-  version = "2.2.2.0";
-  sha256 = "71098017cb64788960eed1de4a88ec0beb6f610d2a3fe88a023b80531a12d7c8";
+  version = "2.3.0.0";
+  sha256 = "6742be657fc65af9aa4f0cedfc7e90b76fba9cb5c736494075182a153244d90f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/either.nix b/pkgs/either.nix
deleted file mode 100644
index 6ef0ebb330da7e58f8d1120712e30099d0da65ee..0000000000000000000000000000000000000000
--- a/pkgs/either.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, QuickCheck, base, bifunctors, lib, mtl, profunctors
-, semigroupoids, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "either";
-  version = "5.0.2";
-  sha256 = "bfa45b967fd77b1c7c952e156377441e3c42b6dc873ab1f06a7421a3222287be";
-  revision = "1";
-  editedCabalFile = "1w2rxrj0gc3a7p74pybji8yy2zsjnhxyi4zhlmx4qsyz6w616ggv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bifunctors mtl profunctors semigroupoids
-  ];
-  testHaskellDepends = [
-    base QuickCheck test-framework test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/either/";
-  description = "Combinators for working with sums";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ekg-core.nix b/pkgs/ekg-core.nix
index c3271619746da01eaf12b85df000a16ab984b1fc..a04f2f7abcea9cfa21ac1eacf42cbb5697dbe357 100644
--- a/pkgs/ekg-core.nix
+++ b/pkgs/ekg-core.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "ekg-core";
   version = "0.1.1.7";
   sha256 = "45813f2b94fde0b92c7979bd37de52f09b8b645560f5789276c3acfc7934db12";
-  revision = "2";
-  editedCabalFile = "05h0jz42s1d3bjcvzbp3dv5rvil4ar244mdqdvzbf60z848ppygl";
+  revision = "3";
+  editedCabalFile = "1z5rhc6cd1jflax3g5c773vghwavid5va6zxmaxhdcs6lj9pgzdj";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ema.nix b/pkgs/ema.nix
index 03b83d01626e3f30e200fad4bb0a9ec7fc4cc6be..989efe88cbcae2f6d8f4eb412637c089a2d140ac 100644
--- a/pkgs/ema.nix
+++ b/pkgs/ema.nix
@@ -8,8 +8,8 @@
 }:
 mkDerivation {
   pname = "ema";
-  version = "0.10.0.0";
-  sha256 = "69332303174f82e3317142c2456a334bf49efad992ab094dbeca7289a820d92b";
+  version = "0.10.2.0";
+  sha256 = "106f148c767d3c8ea07b2b24a1dab009c95020f071cb046e8eaaf3dab56cf9a4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/email-validate.nix b/pkgs/email-validate.nix
index 8cc06c1deb9eab5cf8e40129cfb601fb10d895f2..d1a7bebd01bd35b8e43ef179f26510b224142ce8 100644
--- a/pkgs/email-validate.nix
+++ b/pkgs/email-validate.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, QuickCheck, attoparsec, base, bytestring, doctest
-, hspec, lib, template-haskell
+{ mkDerivation, QuickCheck, attoparsec, base, bytestring, hspec
+, lib, template-haskell
 }:
 mkDerivation {
   pname = "email-validate";
-  version = "2.3.2.18";
-  sha256 = "97492da27ec2e856b807a6703be5952b15fdc9be855a32a81526e68a8b2f7185";
+  version = "2.3.2.19";
+  sha256 = "c864ac949b3f2cb72ad6f1309c1315e4c85c6eb455fcadc297281d54ea2fa360";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     attoparsec base bytestring template-haskell
   ];
-  testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+  testHaskellDepends = [ base bytestring hspec QuickCheck ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/emojis.nix b/pkgs/emojis.nix
index e18111e3dee8ae884c10d7ebe5842a34a1cb168e..1778c990bfd2eae4d7348997afa228c5f943f620 100644
--- a/pkgs/emojis.nix
+++ b/pkgs/emojis.nix
@@ -1,8 +1,8 @@
 { mkDerivation, HUnit, base, containers, lib, text }:
 mkDerivation {
   pname = "emojis";
-  version = "0.1.2";
-  sha256 = "3cfe9c2ea3efbbdb9b7fc24ee6707a839d272c1deee7e39319f17a7e6feea227";
+  version = "0.1.3";
+  sha256 = "817fc6c4d0040418d981b82349e389566db6ce0e0337dc70fe5d1483e1d91af8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/entropy.nix b/pkgs/entropy.nix
deleted file mode 100644
index 6e32691c8e1107a6e44f1efa90c276beb0872914..0000000000000000000000000000000000000000
--- a/pkgs/entropy.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, Cabal, base, bytestring, directory, filepath, lib
-, process, unix
-}:
-mkDerivation {
-  pname = "entropy";
-  version = "0.4.1.10";
-  sha256 = "85ac1d53f1d1c095aedd23fdb20c8e3ada04a7fd8aa6d7e6445ae6a59a277de5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal directory filepath process ];
-  libraryHaskellDepends = [ base bytestring unix ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/TomMD/entropy";
-  description = "A platform independent entropy source";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/envparse.nix b/pkgs/envparse.nix
deleted file mode 100644
index 97db37aa8c71ffc47778d9d0cba90336d22f4947..0000000000000000000000000000000000000000
--- a/pkgs/envparse.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, containers, hspec, lib, text }:
-mkDerivation {
-  pname = "envparse";
-  version = "0.5.0";
-  sha256 = "adb54ae4ef48c8cd124e770bbf774632ff9382dc208eed33e3da44d20fc0db1d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers ];
-  testHaskellDepends = [ base containers hspec text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://supki.github.io/envparse";
-  description = "Parse environment variables";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/erf.nix b/pkgs/erf.nix
deleted file mode 100644
index 9a1ebd22ff996ccbd4dfd5d037d45195561f4d33..0000000000000000000000000000000000000000
--- a/pkgs/erf.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "erf";
-  version = "2.0.0.0";
-  sha256 = "24f0b79c7e1d25cb2cd44c2258d7a464bf6db8079775b50b60b54a254616b337";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "The error function, erf, and related functions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/errors.nix b/pkgs/errors.nix
index 6fd99807957008028ee747b38c4e0fda218de317..034df6510490abdaa1165ed3b8f1d1cceed7aa6b 100644
--- a/pkgs/errors.nix
+++ b/pkgs/errors.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "errors";
   version = "2.3.0";
   sha256 = "6772e5689f07e82077ffe3339bc672934d83d83a97a7d4f1349de1302cb71f75";
-  revision = "4";
-  editedCabalFile = "0sji6ny86f4j9ch1cyf2p1mcr5b2ighvw4bb9rssvypxb6k2r68f";
+  revision = "5";
+  editedCabalFile = "0ljfsadhqbqjivrr08x11zazpl115902ikvyhxq6nmg6zp54w7al";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/extended-reals.nix b/pkgs/extended-reals.nix
index 9af5f64a37669ec2a3a8ce30fdd2e85e76185e0c..85968c90c5e56af22b59eaaa9990abffa205a81c 100644
--- a/pkgs/extended-reals.nix
+++ b/pkgs/extended-reals.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "extended-reals";
   version = "0.2.4.0";
   sha256 = "0c2c664abe60a105207b1678ab699c1b5cf2708976bc6b2b8c3a4e54e93faea5";
-  revision = "1";
-  editedCabalFile = "07qsnn05q9n2l4jh7agql44l2z7rqnwdcp9bssri4chs0jvk15rg";
+  revision = "2";
+  editedCabalFile = "1v4vcrf66bapldw5jswkp4jb1v1qlr5cx2mgjnxb8mszir7s6p1f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/extensible-exceptions.nix b/pkgs/extensible-exceptions.nix
deleted file mode 100644
index a23d02cbe3e96d928227143c414781df1286e0c9..0000000000000000000000000000000000000000
--- a/pkgs/extensible-exceptions.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "extensible-exceptions";
-  version = "0.1.1.4";
-  sha256 = "6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Extensible exceptions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/extra.nix b/pkgs/extra.nix
deleted file mode 100644
index 7e135de668a65e9f327e36ac98edc4da988e2937..0000000000000000000000000000000000000000
--- a/pkgs/extra.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, base, clock, directory, filepath, lib
-, process, quickcheck-instances, time, unix
-}:
-mkDerivation {
-  pname = "extra";
-  version = "1.7.13";
-  sha256 = "bdeac5b0316ce4649faae02f7b79cef2bf59a7ddae6dc1c0e3d6c0667a5c7b67";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base clock directory filepath process time unix
-  ];
-  testHaskellDepends = [
-    base directory filepath QuickCheck quickcheck-instances unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/extra#readme";
-  description = "Extra functions I use";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/fail.nix b/pkgs/fail.nix
deleted file mode 100644
index ddac0caf6dcb72daae9a21a24134267e8a1cdcc4..0000000000000000000000000000000000000000
--- a/pkgs/fail.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, lib }:
-mkDerivation {
-  pname = "fail";
-  version = "4.9.0.0";
-  sha256 = "6d5cdb1a5c539425a9665f740e364722e1d9d6ae37fbc55f30fe3dbbbb91d4a2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
-  description = "Forward-compatible MonadFail class";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/fast-logger.nix b/pkgs/fast-logger.nix
deleted file mode 100644
index 85edb418d9bee6d34a021bbdf3ddddbb65e5e26c..0000000000000000000000000000000000000000
--- a/pkgs/fast-logger.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, array, async, auto-update, base, bytestring
-, directory, easy-file, filepath, hspec, hspec-discover, lib, stm
-, text, unix-compat, unix-time
-}:
-mkDerivation {
-  pname = "fast-logger";
-  version = "3.2.1";
-  sha256 = "89d070b2886ece24f521516d8bffea587226ae2192e36a150a276c4d424f5ee3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array auto-update base bytestring directory easy-file filepath stm
-    text unix-compat unix-time
-  ];
-  testHaskellDepends = [ async base bytestring directory hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/kazu-yamamoto/logger";
-  description = "A fast logging system";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/filelock.nix b/pkgs/filelock.nix
index 25a9eb1d03c471ef65e5835898223d29fb4a7163..8731bbef0daa59a24167d681eb02bd5323ee3fb1 100644
--- a/pkgs/filelock.nix
+++ b/pkgs/filelock.nix
@@ -1,8 +1,8 @@
 { mkDerivation, async, base, lib, process, unix }:
 mkDerivation {
   pname = "filelock";
-  version = "0.1.1.6";
-  sha256 = "af74f6495512bb5aba041d6a6abe2f289251d847ffb296af3df1e511b6355b88";
+  version = "0.1.1.7";
+  sha256 = "4d35645cdf4f0b7aa8d22238885a970aef2328a39bd4ea63c7274532b1748180";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/filtrable.nix b/pkgs/filtrable.nix
index c0c5bdf10531b8c68706565f33478217a693c866..68a4de5b8e2645fdb500fb1b6f801055ead8eed2 100644
--- a/pkgs/filtrable.nix
+++ b/pkgs/filtrable.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "filtrable";
   version = "0.1.6.0";
   sha256 = "be40b79abd9b6563a0146069b22313a4a7b8fb8cf7e3c4bc62fb7725f9a11215";
+  revision = "1";
+  editedCabalFile = "05xz53br6bsdfcv71js7sq4agb8xidl4zvv3f8xfls2a9rvb1jw0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/fin.nix b/pkgs/fin.nix
deleted file mode 100644
index 000f26f9fc1f0ed943f9e8037dc77bbd4d216e28..0000000000000000000000000000000000000000
--- a/pkgs/fin.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, base, boring, dec, deepseq, hashable
-, inspection-testing, lib, some, tagged, universe-base
-}:
-mkDerivation {
-  pname = "fin";
-  version = "0.3";
-  sha256 = "e20d0377e9c9a86b05959b6acb1ab3991dd977ffab46c56e239a5f4052e31c37";
-  revision = "1";
-  editedCabalFile = "14f3mg6hjwy8yycrkj8p925kwb6hjzy2hm6yb4fwl243w92yf5qa";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base boring dec deepseq hashable QuickCheck some universe-base
-  ];
-  testHaskellDepends = [ base inspection-testing tagged ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/vec";
-  description = "Nat and Fin: peano naturals and finite numbers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/fingertree-psqueue.nix b/pkgs/fingertree-psqueue.nix
deleted file mode 100644
index 0c96784965646e76afa09d4a953bcfce29b26018..0000000000000000000000000000000000000000
--- a/pkgs/fingertree-psqueue.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, fetchgit, fingertree, lib }:
-mkDerivation {
-  pname = "fingertree-psqueue";
-  version = "0.3";
-  src = fetchgit {
-    url = "https://gitlab.homotopic.tech/horizon/adopted/fingertree-psqueue";
-    sha256 = "1h13yz23i3flx4mg8czk4k5ypx78q2lwfmmaljm54z3an1p4lv60";
-    rev = "d466b18e18d706dc1373ed2894c1e20ea2826329";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base fingertree ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Implementation of priority search queues as finger trees";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/fingertree.nix b/pkgs/fingertree.nix
deleted file mode 100644
index 9a32caeb08ea1260d8033122e3a777bfa996cf09..0000000000000000000000000000000000000000
--- a/pkgs/fingertree.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, lib, test-framework
-, test-framework-hunit, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "fingertree";
-  version = "0.1.5.0";
-  sha256 = "f3263c92fa8b18f1e1a64cd12480c8c1bee2c1fa0584ab3345f3dd8522bdbf71";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [
-    base HUnit QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Generic finger-tree structure, with example instances";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/first-class-families.nix b/pkgs/first-class-families.nix
deleted file mode 100644
index 8a129e7aa67322b0493152d59affc2fce2e6ee78..0000000000000000000000000000000000000000
--- a/pkgs/first-class-families.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "first-class-families";
-  version = "0.8.0.1";
-  sha256 = "4a1c8fbdbe01757ea8dc3190050d7a4a72c86e205d23676182292fe192c1da72";
-  revision = "2";
-  editedCabalFile = "0idiqb4ckwa7hya827gc2cbjh83wmz3cppnl124834pkla2h99np";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Lysxia/first-class-families#readme";
-  description = "First-class type families";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/flag-dhall-instance.nix b/pkgs/flag-dhall-instance.nix
deleted file mode 100644
index cf6038663aeb724e174453a5ecfab782ea3723f5..0000000000000000000000000000000000000000
--- a/pkgs/flag-dhall-instance.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, dhall, flag, lib }:
-mkDerivation {
-  pname = "flag-dhall-instance";
-  version = "0.1.0.1";
-  sha256 = "5615f009e9494c70e231d80ba05f7594e87ab4bd58b13880381589bda6b1397f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base dhall flag ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "FromDhall and ToDhall instances for flag";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/flag.nix b/pkgs/flag.nix
deleted file mode 100644
index b895091316ade8c67014d68b6539b666ad81168a..0000000000000000000000000000000000000000
--- a/pkgs/flag.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "flag";
-  version = "0.1.0.0";
-  sha256 = "2f75e174a0accdbde3526b362d9a52f1013740327ebbbe43adbe85053a82fb42";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A simple flag type";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/fmlist.nix b/pkgs/fmlist.nix
deleted file mode 100644
index 5c004c9d37576714591bd095323edd222f505d6f..0000000000000000000000000000000000000000
--- a/pkgs/fmlist.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "fmlist";
-  version = "0.9.4";
-  sha256 = "2dbdc1850e6768fd5f4e4c45d011ef6796d8b2d639ec200da7f4407ae02d09a6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sjoerdvisscher/fmlist";
-  description = "FoldMap lists";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/focus.nix b/pkgs/focus.nix
index bbe9632cf8582f0cf14166fc5487abdc4774672c..75129a31fb7715b1f15119500b9c4dc4f884bbea 100644
--- a/pkgs/focus.nix
+++ b/pkgs/focus.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "focus";
-  version = "1.0.3.1";
-  sha256 = "3d31ce2b4bd997eddcd2cfcf2d8afc81112fa8e00c4342e39da0f31a6c7a9098";
+  version = "1.0.3.2";
+  sha256 = "e24b3f0438810302472697ab10280d1ec53bbc98c1ef6812c450301a016cc286";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/foldable1-classes-compat.nix b/pkgs/foldable1-classes-compat.nix
deleted file mode 100644
index 5e6156ab63e0556e2e659a5a37c4265fac2e06b6..0000000000000000000000000000000000000000
--- a/pkgs/foldable1-classes-compat.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, criterion, deepseq
-, ghc-prim, lib, quickcheck-instances, tagged, test-framework
-, test-framework-quickcheck2, transformers
-}:
-mkDerivation {
-  pname = "foldable1-classes-compat";
-  version = "0.1";
-  sha256 = "d057c3f358e1a6b72c73519bc64ba6aa959f066c08fed69f73258555ef95ff12";
-  revision = "2";
-  editedCabalFile = "05sdpi0c503xgrgg2cg4922r5ja5154lfwzi9mgcmxncsk02a4l5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-prim tagged transformers
-  ];
-  testHaskellDepends = [
-    base containers QuickCheck quickcheck-instances test-framework
-    test-framework-quickcheck2 transformers
-  ];
-  benchmarkHaskellDepends = [
-    base containers criterion deepseq transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-compat/foldable1-classes-compat";
-  description = "Compatibility package for the Foldable1 and Bifoldable1 type classes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/foldl.nix b/pkgs/foldl.nix
deleted file mode 100644
index 6c939d7b956cf3d3257c5036017bd287bd917d48..0000000000000000000000000000000000000000
--- a/pkgs/foldl.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, base, bytestring, comonad, containers
-, contravariant, criterion, doctest, hashable, lib, primitive
-, profunctors, random, semigroupoids, text, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "foldl";
-  version = "1.4.14";
-  sha256 = "8c056f8eea4b598aa584b7d752221e71b380ef675b97dd5d779fa12662560e46";
-  revision = "1";
-  editedCabalFile = "0v055cj7sw5xa7v0lm2gryfhj8nxhnjrs1zm9nnxyzgv2aivb8vc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring comonad containers contravariant hashable primitive
-    profunctors random semigroupoids text transformers
-    unordered-containers vector
-  ];
-  testHaskellDepends = [ base doctest ];
-  benchmarkHaskellDepends = [ base criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Composable, streaming, and efficient left folds";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/force-layout.nix b/pkgs/force-layout.nix
index 94d8569471d81c5d6d3df42b4e13ec978d0e8928..2891b1e88bf5c119d98e3a3feda2eef5aefe6671 100644
--- a/pkgs/force-layout.nix
+++ b/pkgs/force-layout.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "force-layout";
   version = "0.4.0.6";
   sha256 = "f7729855b1b14e0b255325faaca9f4834004e02bd21def6a865d2c55c734259d";
-  revision = "10";
-  editedCabalFile = "1mcs51d1a3klzy938wq0gcbx7ln49g940zhajmflxq6imy5h5kwa";
+  revision = "11";
+  editedCabalFile = "1l6v0yy0bb72k0gp58s8vykxyj8qncijax7ds42wgfn378ry8w4j";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/fourmolu.nix b/pkgs/fourmolu.nix
index 6e080b4aae9fd10a7ecf24f835fcbc2454177365..dfc53aa61d4521045db334888fef7353a697c600 100644
--- a/pkgs/fourmolu.nix
+++ b/pkgs/fourmolu.nix
@@ -1,30 +1,30 @@
 { mkDerivation, Cabal-syntax, Diff, MemoTrie, QuickCheck, aeson
-, ansi-terminal, array, base, bytestring, containers, directory
-, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
+, ansi-terminal, array, base, binary, bytestring, containers
+, deepseq, directory, file-embed, filepath, ghc-lib-parser, hspec
 , hspec-discover, hspec-megaparsec, lib, megaparsec, mtl
-, optparse-applicative, path, path-io, pretty, process, syb
-, template-haskell, temporary, text, th-lift-instances, yaml
+, optparse-applicative, path, path-io, pretty, process, scientific
+, syb, temporary, text, th-env, yaml
 }:
 mkDerivation {
   pname = "fourmolu";
-  version = "0.10.1.0";
-  sha256 = "e442b4aa21c320994c57f0c87bb7e6bf005207a167cb7e812c5142e4b8687f3e";
+  version = "0.14.1.0";
+  sha256 = "b4b78a1b7b4e643dab2989ace724d37d1a9280b2be0537692d7989435dd119f3";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson ansi-terminal array base bytestring Cabal-syntax containers
-    Diff directory dlist exceptions filepath ghc-lib-parser megaparsec
-    MemoTrie mtl syb template-haskell text th-lift-instances yaml
+    aeson ansi-terminal array base binary bytestring Cabal-syntax
+    containers deepseq Diff directory file-embed filepath
+    ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml
   ];
   executableHaskellDepends = [
-    base containers directory filepath ghc-lib-parser gitrev
-    optparse-applicative text yaml
+    base Cabal-syntax containers directory filepath ghc-lib-parser
+    optparse-applicative text th-env yaml
   ];
   testHaskellDepends = [
-    base containers Diff directory filepath ghc-lib-parser hspec
-    hspec-megaparsec megaparsec path path-io pretty process QuickCheck
-    temporary text
+    base bytestring Cabal-syntax containers Diff directory filepath
+    ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io
+    pretty process QuickCheck temporary text yaml
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
diff --git a/pkgs/free.nix b/pkgs/free.nix
deleted file mode 100644
index e48a469e5e99029fc380fa91cafc1eda39840eb7..0000000000000000000000000000000000000000
--- a/pkgs/free.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, comonad, containers, distributive, exceptions
-, indexed-traversable, lib, mtl, profunctors, semigroupoids
-, template-haskell, th-abstraction, transformers, transformers-base
-}:
-mkDerivation {
-  pname = "free";
-  version = "5.2";
-  sha256 = "72867f7c89173263765736e8d395e94291f1aaea626ecb1d673d72ce90b94f89";
-  revision = "1";
-  editedCabalFile = "0gpz9jlvdnds3988naqxn1dn1hr4zk3md1dhkky4hv0a2b69z7nh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base comonad containers distributive exceptions indexed-traversable
-    mtl profunctors semigroupoids template-haskell th-abstraction
-    transformers transformers-base
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/free/";
-  description = "Monads for free";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generic-data.nix b/pkgs/generic-data.nix
index 3b13df6b6ac7280ef9bf121ab405505d04e9eccf..7b49274f2efa2e38e85da928486e2c3f7d7d58ee 100644
--- a/pkgs/generic-data.nix
+++ b/pkgs/generic-data.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "generic-data";
   version = "1.1.0.0";
   sha256 = "b12cbc4d99b35f3638aa47a5c45a8f1b3b633ac0d2fff24a0c10ec72089bbccb";
+  revision = "1";
+  editedCabalFile = "1njfdpp8rckkibixp89rz8dh4qmz67404gbwq2l0qmfcglzf997p";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/generic-deriving.nix b/pkgs/generic-deriving.nix
deleted file mode 100644
index 9a7531d92131d570921672029cb9c97a446208c3..0000000000000000000000000000000000000000
--- a/pkgs/generic-deriving.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
-, lib, template-haskell, th-abstraction
-}:
-mkDerivation {
-  pname = "generic-deriving";
-  version = "1.14.4";
-  sha256 = "372b87b2c91ed4ceff8602024a484944f4653456066755803b5cb268fed8195c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-prim template-haskell th-abstraction
-  ];
-  testHaskellDepends = [ base hspec template-haskell ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/dreixel/generic-deriving";
-  description = "Generic programming library for generalised deriving";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generic-random.nix b/pkgs/generic-random.nix
deleted file mode 100644
index 416c60909bba1065875f9a2b6be73a537280af46..0000000000000000000000000000000000000000
--- a/pkgs/generic-random.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, lib }:
-mkDerivation {
-  pname = "generic-random";
-  version = "1.5.0.1";
-  sha256 = "dd3451808788d99211edeac27287db5417e97234ce9221a2eb9ab02e9cfc2c0a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base QuickCheck ];
-  testHaskellDepends = [ base deepseq QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/lysxia/generic-random";
-  description = "Generic random generators for QuickCheck";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generically.nix b/pkgs/generically.nix
deleted file mode 100644
index aa94bf6a0f78e5a530dce14ee9e1eb0e6abc285f..0000000000000000000000000000000000000000
--- a/pkgs/generically.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, base-orphans, lib }:
-mkDerivation {
-  pname = "generically";
-  version = "0.1.1";
-  sha256 = "04c5a436bec4b041f71a733f56a1bd7f435f63dde8d3eb5c1f48d55b4dbc43cf";
-  revision = "1";
-  editedCabalFile = "0pkyhym7q9v03pplpfjg80vmpk0cbgc56panfx9vcbzadvxmx6rb";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base base-orphans ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Generically newtype to use with DerivingVia";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/generics-sop.nix b/pkgs/generics-sop.nix
index 2bce68cc67a1d41e6c3531583ee27da6ba3f0d84..14b4dd16464007db64701e93fd5d6eeb67a992c8 100644
--- a/pkgs/generics-sop.nix
+++ b/pkgs/generics-sop.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "generics-sop";
-  version = "0.5.1.3";
-  sha256 = "ec9cc7b9ca4714fd67538ac4a5ea980ec731cfe0f084c097f8dd284b5669af07";
+  version = "0.5.1.4";
+  sha256 = "616a1c2176097469f9514e76d979fffdbc12d569f44fd01deb14377c7888797e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/genvalidity-hspec.nix b/pkgs/genvalidity-hspec.nix
deleted file mode 100644
index 4487a1116e68da7063fb0a031db4ec77053fe99f..0000000000000000000000000000000000000000
--- a/pkgs/genvalidity-hspec.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-property
-, hspec, hspec-core, lib, transformers, validity
-}:
-mkDerivation {
-  pname = "genvalidity-hspec";
-  version = "1.0.0.2";
-  sha256 = "84f9a27f7345616162e80081b867961734fc750acdbac40e64c5db4d7f055b03";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base genvalidity genvalidity-property hspec hspec-core QuickCheck
-    transformers validity
-  ];
-  testHaskellDepends = [
-    base genvalidity hspec hspec-core QuickCheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Standard spec's for GenValidity instances";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/genvalidity-persistent.nix b/pkgs/genvalidity-persistent.nix
index 531afa98ededb34d8c3a6c309d1fae9daad2c981..b6d7c02df166e001b73d438d6d32cbb22e5c1caf 100644
--- a/pkgs/genvalidity-persistent.nix
+++ b/pkgs/genvalidity-persistent.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "genvalidity-persistent";
-  version = "1.0.0.1";
-  sha256 = "5982eb6b9b9d5e31287d6de76a5fb25d3721a3274cde107dfd19ccb214a571c0";
+  version = "1.0.0.2";
+  sha256 = "7e0b65463512d455d1c9e61ef28fa7d2e5923a9cfa2a33611d77fd50b64e49c5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/genvalidity-property.nix b/pkgs/genvalidity-property.nix
deleted file mode 100644
index b8ce09640563221f9c201d59670efea3503bf91b..0000000000000000000000000000000000000000
--- a/pkgs/genvalidity-property.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, genvalidity, hspec, lib
-, pretty-show, validity
-}:
-mkDerivation {
-  pname = "genvalidity-property";
-  version = "1.0.0.0";
-  sha256 = "9c5e385ac5dd5b554d8ff07422261248178bcee8f226b2c7ca93cd4c006eacdb";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base genvalidity hspec pretty-show QuickCheck validity
-  ];
-  testHaskellDepends = [ base genvalidity hspec QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Standard properties for functions on `Validity` types";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest-hashable.nix b/pkgs/genvalidity-sydtest-hashable.nix
index fee866cea8067d6c513dda8186e03972b51e86b5..228dfe87344c6cc699f92f94492cf410cae018f4 100644
--- a/pkgs/genvalidity-sydtest-hashable.nix
+++ b/pkgs/genvalidity-sydtest-hashable.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "genvalidity-sydtest-hashable";
-  version = "1.0.0.0";
-  sha256 = "5f4442eb5902c86d72b8340152069d3c3cdb768d8eee0d81e469a650ad178814";
+  version = "1.0.0.1";
+  sha256 = "a2e8037aea68c4721441797ed76802dd2c86d960a3dd29e862bc314a20d9aaee";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/genvalidity-unordered-containers.nix b/pkgs/genvalidity-unordered-containers.nix
index d3597a56d7d4f8b9b4b5a5ec1e0177bb89b79e75..26474b57c849e8bd48b18cc8894fa65a1c432839 100644
--- a/pkgs/genvalidity-unordered-containers.nix
+++ b/pkgs/genvalidity-unordered-containers.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "genvalidity-unordered-containers";
-  version = "1.0.0.0";
-  sha256 = "b325c19594853133b62019ad35ed86616b92ac1afd18a5f49a801e3e453fa6e9";
+  version = "1.0.0.1";
+  sha256 = "131481f7eae6edf1e011e3cd5dd67bb2c1113f7429b0a522838d908235d40021";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/genvalidity.nix b/pkgs/genvalidity.nix
deleted file mode 100644
index 4e546a04ca8b64569c3f9478bb59bc2c459e4a45..0000000000000000000000000000000000000000
--- a/pkgs/genvalidity.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, QuickCheck, base, hspec, hspec-core, lib, random
-, validity
-}:
-mkDerivation {
-  pname = "genvalidity";
-  version = "1.1.0.0";
-  sha256 = "5897d7640a93ad6cd12177375009cad5189ba147edff80ded0c2a508ff5bbb23";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base QuickCheck random validity ];
-  testHaskellDepends = [ base hspec hspec-core QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Testing utilities for the validity library";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ghc-byteorder.nix b/pkgs/ghc-byteorder.nix
deleted file mode 100644
index 8a781a05ab68dd86bff3edf8d7a2e75e04386c9f..0000000000000000000000000000000000000000
--- a/pkgs/ghc-byteorder.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "ghc-byteorder";
-  version = "4.11.0.0.10";
-  sha256 = "86e50a89798181db4f44ec3848fc52940c73098e88549a351ceb54fefc691fb6";
-  revision = "4";
-  editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "\"GHC.ByteOrder\" API Compatibility Layer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ghc-exactprint.nix b/pkgs/ghc-exactprint.nix
index ea1f07e583266ed4df72771d76e1631a3da0d86b..3366033948d11fc38815d763d6ebd3a60060fced 100644
--- a/pkgs/ghc-exactprint.nix
+++ b/pkgs/ghc-exactprint.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "ghc-exactprint";
-  version = "1.6.1.1";
-  sha256 = "8883b247ca97c8720c047b820941c1119c4537c0121b21b02cca441ea12df437";
+  version = "1.6.1.3";
+  sha256 = "feba1ec1d3df0822ecfb74cfa6221f3c0966419919fa508b031492dc523a4be3";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghc-lib-parser-ex.nix b/pkgs/ghc-lib-parser-ex.nix
index 3434a3ab19c24bfa95491a864d64aafa10d75b8b..f446211f2d957ca58dec0db7c9fd20a68d5cb8a0 100644
--- a/pkgs/ghc-lib-parser-ex.nix
+++ b/pkgs/ghc-lib-parser-ex.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "ghc-lib-parser-ex";
-  version = "9.4.0.0";
-  sha256 = "ce3ff339a0a259a18ae921c547b35732eaca1a567a33fba1a7c65c16c973191b";
+  version = "9.6.0.2";
+  sha256 = "2a618793031316c46bcbf44ad5f09878a03c52e3c9ad5d45f89d3f48d62826bb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghc-lib-parser.nix b/pkgs/ghc-lib-parser.nix
index 1b8f24ed6414aa77b2586fbe2621c33df7315dc3..0b5687d4dad9d87026a0b080a43b6133631168bd 100644
--- a/pkgs/ghc-lib-parser.nix
+++ b/pkgs/ghc-lib-parser.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "ghc-lib-parser";
-  version = "9.4.4.20221225";
-  sha256 = "67f6d80ce04d4178b762c7e139388c1106a818d8a532a5ac458c8209ef61652b";
+  version = "9.6.3.20231014";
+  sha256 = "389c9229a966fb7d11bdec30e94e47299820e1c24c15e959da242f368c3c77cc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/ghc-paths.nix b/pkgs/ghc-paths.nix
deleted file mode 100644
index 653f5348d52c982ad97a704a8d93a4c892948a06..0000000000000000000000000000000000000000
--- a/pkgs/ghc-paths.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, Cabal, base, directory, lib }:
-mkDerivation {
-  pname = "ghc-paths";
-  version = "0.1.0.12";
-  sha256 = "6ecbe676d073cb07989c61ce4c5709c4e67cbefdd2d55a4095f9388b6fe2c484";
-  revision = "5";
-  editedCabalFile = "12y71qx0yjxxjjzvkpx12ld0fkmpkli8qxpfxp3xfnz8w0gxbv9c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal directory ];
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Knowledge of GHC's installation directories";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ghc-tcplugins-extra.nix b/pkgs/ghc-tcplugins-extra.nix
index eb9004c033664ed8e601a144b35dfd64197fa67f..46df968352eaee838ee8de3b3c5a0dc8d9623605 100644
--- a/pkgs/ghc-tcplugins-extra.nix
+++ b/pkgs/ghc-tcplugins-extra.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, ghc, lib }:
 mkDerivation {
   pname = "ghc-tcplugins-extra";
-  version = "0.4.4";
-  sha256 = "3c21708a6e080a915bf29bf60f1bfde68b516f076cea8a7c5c2683a725efde79";
+  version = "0.4.5";
+  sha256 = "0b6831620bae37d090139a89635d31c83b37a29ee89c26f0a586452b94ae10c3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghc-typelits-knownnat.nix b/pkgs/ghc-typelits-knownnat.nix
index 58dd00f23ba1c86b94dcfe9b8bd8ad5f430a7ab7..b4560ec8e3570777969ce8e032eea4c24bad1aa5 100644
--- a/pkgs/ghc-typelits-knownnat.nix
+++ b/pkgs/ghc-typelits-knownnat.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "ghc-typelits-knownnat";
-  version = "0.7.8";
-  sha256 = "2723ee1dc9024a4a8ddf93dbb6082410fc05deeee7bd975c8ce5d7fed71bea22";
+  version = "0.7.9";
+  sha256 = "8d9963f02daaedb20c0edc1c27e6e7536ebbe927b281319e7d2cc9f1e5066dc0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghc-typelits-natnormalise.nix b/pkgs/ghc-typelits-natnormalise.nix
index b8fab56594e27c2beaaa2130b79ad5f8b9128db6..d9599215368c48f484416387c6130597cc66c801 100644
--- a/pkgs/ghc-typelits-natnormalise.nix
+++ b/pkgs/ghc-typelits-natnormalise.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "ghc-typelits-natnormalise";
-  version = "0.7.8";
-  sha256 = "d68a0e61ad67f6d267003fe779f43f82152d6eddbc41efd738d6da38cd00de42";
+  version = "0.7.9";
+  sha256 = "86e08fb6a3b7d9039756353394e59226d344d602f4ff552a29116608808ac7ba";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghcid.nix b/pkgs/ghcid.nix
index 5622b0d37b27acc6d496d01a5b92c45e1e957ad3..90650430278dcfb562b3c16daa1ab19fa92d3333 100644
--- a/pkgs/ghcid.nix
+++ b/pkgs/ghcid.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "ghcid";
-  version = "0.8.8";
-  sha256 = "92c96e439dd1e0b760181d17ac2ff84f96d0d4871c2f03296a3278095ec858f8";
+  version = "0.8.9";
+  sha256 = "44c29c53fc33541fbde0702c62faa6a756468a24381d1184472b7ede00a308b7";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ghcide-bench.nix b/pkgs/ghcide-bench.nix
index 3d2980f7578b85b3340f27262e8913d850e7b165..f061617a4cd1ba6744f9312809eb75f246622c7c 100644
--- a/pkgs/ghcide-bench.nix
+++ b/pkgs/ghcide-bench.nix
@@ -2,21 +2,21 @@
 , data-default, deepseq, directory, extra, filepath, ghcide
 , ghcide-test-utils, hashable, hls-graph, hls-plugin-api
 , implicit-hie, lens, lib, lsp-test, lsp-types
-, optparse-applicative, parser-combinators, process
+, optparse-applicative, parser-combinators, process, row-types
 , safe-exceptions, shake, tasty, tasty-hunit, tasty-rerun, text
 }:
 mkDerivation {
   pname = "ghcide-bench";
-  version = "2.0.0.1";
-  sha256 = "f4333a5665293aa4d22597cce3a0f662a0ab3dc09699bc501f48b735e1255183";
+  version = "2.4.0.0";
+  sha256 = "cc8ba53e0cc7fd5648f49d266f25bd978e8d507f149dd8915d75d98cc795973e";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson async base binary bytestring deepseq directory extra filepath
     ghcide ghcide-test-utils hashable lens lsp-test lsp-types
-    optparse-applicative parser-combinators process safe-exceptions
-    shake text
+    optparse-applicative parser-combinators process row-types
+    safe-exceptions shake text
   ];
   executableHaskellDepends = [
     aeson base bytestring containers data-default directory extra
diff --git a/pkgs/ghcide.nix b/pkgs/ghcide.nix
index 93b264a1fcac1955413d1a6822c6ffedc8726984..273d52b21f610a07ec638583c24c7394c7bf779a 100644
--- a/pkgs/ghcide.nix
+++ b/pkgs/ghcide.nix
@@ -1,30 +1,30 @@
-{ mkDerivation, Diff, Glob, QuickCheck, aeson, aeson-pretty, array
-, async, base, base16-bytestring, binary, bytestring
-, case-insensitive, co-log-core, containers, cryptohash-sha1
-, data-default, deepseq, dependent-map, dependent-sum, directory
-, dlist, enummapset, exceptions, extra, filepath, fingertree, focus
-, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths
-, ghc-trace-events, gitrev, haddock-library, hashable, hie-bios
-, hie-compat, hiedb, hls-graph, hls-plugin-api, implicit-hie
-, implicit-hie-cradle, lens, lib, list-t, lsp, lsp-test, lsp-types
-, monoid-subclasses, mtl, network-uri, opentelemetry
-, optparse-applicative, parallel, prettyprinter
-, prettyprinter-ansi-terminal, random, regex-tdfa, safe-exceptions
-, shake, sorted-list, sqlite-simple, stm, stm-containers, syb
-, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck
-, tasty-rerun, text, text-rope, time, transformers, unix, unliftio
-, unliftio-core, unordered-containers, vector
+{ mkDerivation, Diff, Glob, QuickCheck, aeson, array, async, base
+, base16-bytestring, binary, bytestring, case-insensitive
+, co-log-core, containers, cryptohash-sha1, data-default, deepseq
+, dependent-map, dependent-sum, directory, dlist, enummapset
+, exceptions, extra, filepath, fingertree, focus, fuzzy, ghc
+, ghc-boot, ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events
+, gitrev, haddock-library, hashable, hie-bios, hie-compat, hiedb
+, hls-graph, hls-plugin-api, implicit-hie, implicit-hie-cradle
+, lens, lib, list-t, lsp, lsp-test, lsp-types, monoid-subclasses
+, mtl, network-uri, opentelemetry, optparse-applicative, parallel
+, prettyprinter, prettyprinter-ansi-terminal, random, regex-tdfa
+, row-types, safe-exceptions, shake, sorted-list, sqlite-simple
+, stm, stm-containers, syb, tasty, tasty-expected-failure
+, tasty-hunit, tasty-quickcheck, tasty-rerun, text, text-rope, time
+, transformers, unix, unliftio, unliftio-core, unordered-containers
+, vector
 }:
 mkDerivation {
   pname = "ghcide";
-  version = "2.0.0.1";
-  sha256 = "927ffa9410c6d5c66ca43cdaad788a55c67c031821afe7b9fb41bd98b9cd5afa";
+  version = "2.4.0.0";
+  sha256 = "6675ef6543b2e2f16fb3096fc7c2047d5cbe910c70abcb3ccd79faca4bea4cdf";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson aeson-pretty array async base base16-bytestring binary
-    bytestring case-insensitive co-log-core containers cryptohash-sha1
+    aeson array async base base16-bytestring binary bytestring
+    case-insensitive co-log-core containers cryptohash-sha1
     data-default deepseq dependent-map dependent-sum Diff directory
     dlist enummapset exceptions extra filepath fingertree focus ghc
     ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob
@@ -32,9 +32,9 @@ mkDerivation {
     hls-plugin-api implicit-hie implicit-hie-cradle lens list-t lsp
     lsp-types mtl opentelemetry optparse-applicative parallel
     prettyprinter prettyprinter-ansi-terminal random regex-tdfa
-    safe-exceptions sorted-list sqlite-simple stm stm-containers syb
-    text text-rope time transformers unix unliftio unliftio-core
-    unordered-containers vector
+    row-types safe-exceptions sorted-list sqlite-simple stm
+    stm-containers syb text text-rope time transformers unix unliftio
+    unliftio-core unordered-containers vector
   ];
   executableHaskellDepends = [
     base data-default extra gitrev hls-plugin-api lsp lsp-types
@@ -43,10 +43,10 @@ mkDerivation {
   testHaskellDepends = [
     aeson async base containers data-default directory extra filepath
     fuzzy ghc hls-plugin-api lens list-t lsp lsp-test lsp-types
-    monoid-subclasses network-uri QuickCheck random regex-tdfa shake
-    sqlite-simple stm stm-containers tasty tasty-expected-failure
-    tasty-hunit tasty-quickcheck tasty-rerun text text-rope
-    unordered-containers
+    monoid-subclasses mtl network-uri QuickCheck random regex-tdfa
+    row-types shake sqlite-simple stm stm-containers tasty
+    tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
+    text text-rope unordered-containers
   ];
   testToolDepends = [ implicit-hie ];
   enableLibraryProfiling = true;
diff --git a/pkgs/githash.nix b/pkgs/githash.nix
index d0c40e566e117f1baccf61ca8df01277dcc3bede..387aa95a6f05d679cd213fbad495b6828d144a64 100644
--- a/pkgs/githash.nix
+++ b/pkgs/githash.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "githash";
-  version = "0.1.6.3";
-  sha256 = "fcba79b60ef87bdd4976332e998589a62e1be012b932b543b49de5e0620eef1b";
+  version = "0.1.7.0";
+  sha256 = "1ad5e7c26bd9c9c4e4c3232206694b153845fe11f227e39d214eef0d95f330d4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hackage-db.nix b/pkgs/hackage-db.nix
deleted file mode 100644
index dc91149755a341d4859969a535656c9144e0f4cd..0000000000000000000000000000000000000000
--- a/pkgs/hackage-db.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, Cabal, aeson, base, bytestring, containers
-, directory, exceptions, filepath, lib, tar, time, utf8-string
-}:
-mkDerivation {
-  pname = "hackage-db";
-  version = "2.1.3";
-  sha256 = "6b7fb10990d8265f45687af4764a0f9392d49417de8ae433880795c77be2f7e7";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bytestring Cabal containers directory exceptions
-    filepath tar time utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
-  description = "Access cabal-install's Hackage database via Data.Map";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hackage-security.nix b/pkgs/hackage-security.nix
index dd13c3f85d850eced9fd5c63ac1e5ab3a7c96e7e..543bdb94935acf3354be502b0d9b2d8644383998 100644
--- a/pkgs/hackage-security.nix
+++ b/pkgs/hackage-security.nix
@@ -9,8 +9,8 @@ mkDerivation {
   pname = "hackage-security";
   version = "0.6.2.3";
   sha256 = "52ee0576971955571d846b8e6c09638f89f4f7881f4a95173e44ccc0d856a066";
-  revision = "3";
-  editedCabalFile = "1vdmpklil8a6r03ixzch5d36ngimmq5q8931i8bg9f7hh8nmq8jv";
+  revision = "8";
+  editedCabalFile = "1gzk9hrq0rv94msbvnkynzj5pnh94ixray8dl639zr29qh55cbib";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/haddock-library.nix b/pkgs/haddock-library.nix
index 9db534a91f83467271b4cea5797f2d31cb0aeb7e..6880316d63fda7914411a0b8dfe712a10aeef9d0 100644
--- a/pkgs/haddock-library.nix
+++ b/pkgs/haddock-library.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "haddock-library";
   version = "1.11.0";
   sha256 = "7c075ec9a378b0a2d9d605e72135201e6c7ff316564f2c974113582f43bea20a";
-  revision = "2";
-  editedCabalFile = "04hvk5q2x8j75z1yknfxa1607hwb8xx4k5bgdq8qmw2a5zkb5fyy";
+  revision = "3";
+  editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hakyll.nix b/pkgs/hakyll.nix
deleted file mode 100644
index 041920b52fcdc8fb87898e7e5ac323673573bdce..0000000000000000000000000000000000000000
--- a/pkgs/hakyll.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, binary
-, blaze-html
-, blaze-markup
-, bytestring
-, containers
-, data-default
-, deepseq
-, directory
-, file-embed
-, filepath
-, fsnotify
-, hashable
-, http-conduit
-, http-types
-, lib
-, lifted-async
-, lrucache
-, mtl
-, network-uri
-, optparse-applicative
-, pandoc
-, parsec
-, process
-, random
-, regex-tdfa
-, resourcet
-, scientific
-, tagsoup
-, tasty
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
-, time
-, time-locale-compat
-, unordered-containers
-, util-linux
-, vector
-, wai
-, wai-app-static
-, warp
-, yaml
-}:
-mkDerivation {
-  pname = "hakyll";
-  version = "4.15.1.1";
-  sha256 = "71c3dd6689904d99c0bd104f7d64c3e32736f4ffcfa8a431eaab075c8ee06b2c";
-  revision = "8";
-  editedCabalFile = "0mrgi1xjmvbjqasrchmjylp4gc63gw879flwl6r1v3nf9nv7ziwf";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    aeson
-    base
-    binary
-    blaze-html
-    blaze-markup
-    bytestring
-    containers
-    data-default
-    deepseq
-    directory
-    file-embed
-    filepath
-    fsnotify
-    hashable
-    http-conduit
-    http-types
-    lifted-async
-    lrucache
-    mtl
-    network-uri
-    optparse-applicative
-    pandoc
-    parsec
-    process
-    random
-    regex-tdfa
-    resourcet
-    scientific
-    tagsoup
-    template-haskell
-    text
-    time
-    time-locale-compat
-    unordered-containers
-    vector
-    wai
-    wai-app-static
-    warp
-    yaml
-  ];
-  executableHaskellDepends = [ base directory filepath ];
-  testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    filepath
-    QuickCheck
-    tagsoup
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    text
-    unordered-containers
-    yaml
-  ];
-  testToolDepends = [ util-linux ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://jaspervdj.be/hakyll";
-  description = "A static website compiler library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
diff --git a/pkgs/half.nix b/pkgs/half.nix
deleted file mode 100644
index 2c2c8bfdf59baed0a0578b61fbfc31bc337c11cc..0000000000000000000000000000000000000000
--- a/pkgs/half.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq, lib
-, template-haskell, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "half";
-  version = "0.3.1";
-  sha256 = "e2afc32724e11bf5c695d797b9169d9d9b2dc62a530aed31284c8187af1615d1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base binary deepseq template-haskell ];
-  testHaskellDepends = [
-    base binary bytestring QuickCheck test-framework
-    test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/half";
-  description = "Half-precision floating-point";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/happy.nix b/pkgs/happy.nix
deleted file mode 100644
index a4831a3f0b7a66be7059970477d6b924bc1050e6..0000000000000000000000000000000000000000
--- a/pkgs/happy.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, array, base, containers, lib, mtl, process }:
-mkDerivation {
-  pname = "happy";
-  version = "1.20.1.1";
-  sha256 = "8b4e7dc5a6c5fd666f8f7163232931ab28746d0d17da8fa1cbd68be9e878881b";
-  isLibrary = false;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  executableHaskellDepends = [ array base containers mtl ];
-  testHaskellDepends = [ base process ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://www.haskell.org/happy/";
-  description = "Happy is a parser generator for Haskell";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hashable.nix b/pkgs/hashable.nix
deleted file mode 100644
index 6a1fb4ff4ea1e3eee2ddd4ca0274b30118421ef7..0000000000000000000000000000000000000000
--- a/pkgs/hashable.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, containers
-, deepseq, filepath, ghc-bignum, ghc-prim, lib, random
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text, unix
-}:
-mkDerivation {
-  pname = "hashable";
-  version = "1.4.2.0";
-  sha256 = "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8";
-  revision = "1";
-  editedCabalFile = "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers deepseq filepath ghc-bignum ghc-prim
-    text
-  ];
-  testHaskellDepends = [
-    base bytestring ghc-prim HUnit QuickCheck random test-framework
-    test-framework-hunit test-framework-quickcheck2 text unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/haskell-unordered-containers/hashable";
-  description = "A class for types that can be converted to a hash value";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hashmap.nix b/pkgs/hashmap.nix
deleted file mode 100644
index 767f1ad4fae4bb31ffa1f0d098e5b23317ed5307..0000000000000000000000000000000000000000
--- a/pkgs/hashmap.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, containers, deepseq, hashable, lib }:
-mkDerivation {
-  pname = "hashmap";
-  version = "1.3.3";
-  sha256 = "dc06b57cd1bcd656d4602df7705a3f11a54ae65f664e9be472d42a9bdcd64755";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers deepseq hashable ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/foxik/hashmap";
-  description = "Persistent containers Map and Set based on hashing";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/haskell-language-server.nix b/pkgs/haskell-language-server.nix
index 3ebdcc809d92cbcada307d14dc393df380613c73..8c07436b00d90f3bbabc9ab6130168f961f8a212 100644
--- a/pkgs/haskell-language-server.nix
+++ b/pkgs/haskell-language-server.nix
@@ -7,25 +7,24 @@
 , hls-change-type-signature-plugin, hls-class-plugin
 , hls-code-range-plugin, hls-explicit-fixity-plugin
 , hls-explicit-imports-plugin, hls-explicit-record-fields-plugin
-, hls-fourmolu-plugin, hls-gadt-plugin, hls-graph, hls-hlint-plugin
+, hls-gadt-plugin, hls-graph, hls-hlint-plugin
 , hls-module-name-plugin, hls-overloaded-record-dot-plugin
 , hls-plugin-api, hls-pragmas-plugin
 , hls-qualify-imported-names-plugin, hls-refactor-plugin
-, hls-refine-imports-plugin, hls-retrie-plugin, hls-splice-plugin
-, hls-test-utils, hp2pretty, hspec-expectations, implicit-hie, lens
-, lens-aeson, lib, lsp, lsp-test, lsp-types, mtl
-, optparse-applicative, optparse-simple, prettyprinter, process
-, regex-tdfa, safe-exceptions, shake, shake-bench, sqlite-simple
-, stm, temporary, text, transformers, unix, unliftio-core
-, unordered-containers, yaml
+, hls-retrie-plugin, hls-splice-plugin, hls-test-utils, hp2pretty
+, hspec-expectations, implicit-hie, lens, lens-aeson, lib, lsp
+, lsp-test, lsp-types, mtl, optparse-applicative, optparse-simple
+, prettyprinter, process, regex-tdfa, row-types, safe-exceptions
+, shake, shake-bench, sqlite-simple, stm, temporary, text
+, transformers, unix, unliftio-core, unordered-containers, yaml
 }:
 mkDerivation {
   pname = "haskell-language-server";
-  version = "2.0.0.1";
-  sha256 = "19f3015f63b60ab2aaeed29bb8bdc1a12e537b721e0caf446a9f0982b27e6cb4";
+  version = "2.4.0.0";
+  sha256 = "0fc7d587b3cd288d770c684611367fab666f9790c56e49d920787b15b4deeb4b";
   configureFlags = [
-    "-f-dynamic" "-f-eval" "-f-floskell" "-f-ormolu" "-f-rename"
-    "-f-stylishhaskell"
+    "-f-dynamic" "-f-eval" "-f-floskell" "-f-fourmolu" "-f-ormolu"
+    "-f-refine-imports" "-f-rename" "-f-stylishhaskell"
   ];
   isLibrary = true;
   isExecutable = true;
@@ -38,13 +37,12 @@ mkDerivation {
     hls-change-type-signature-plugin hls-class-plugin
     hls-code-range-plugin hls-explicit-fixity-plugin
     hls-explicit-imports-plugin hls-explicit-record-fields-plugin
-    hls-fourmolu-plugin hls-gadt-plugin hls-graph hls-hlint-plugin
-    hls-module-name-plugin hls-overloaded-record-dot-plugin
-    hls-plugin-api hls-pragmas-plugin hls-qualify-imported-names-plugin
-    hls-refactor-plugin hls-refine-imports-plugin hls-retrie-plugin
-    hls-splice-plugin lsp optparse-applicative optparse-simple
-    prettyprinter process safe-exceptions sqlite-simple text
-    unordered-containers
+    hls-gadt-plugin hls-graph hls-hlint-plugin hls-module-name-plugin
+    hls-overloaded-record-dot-plugin hls-plugin-api hls-pragmas-plugin
+    hls-qualify-imported-names-plugin hls-refactor-plugin
+    hls-retrie-plugin hls-splice-plugin lsp optparse-applicative
+    optparse-simple prettyprinter process safe-exceptions sqlite-simple
+    text unordered-containers
   ];
   executableHaskellDepends = [
     aeson async base base16-bytestring binary bytestring containers
@@ -59,7 +57,7 @@ mkDerivation {
     aeson base bytestring containers data-default deepseq directory
     extra filepath ghcide ghcide-test-utils hashable hls-plugin-api
     hls-refactor-plugin hls-test-utils hspec-expectations lens
-    lens-aeson lsp-test lsp-types prettyprinter process text
+    lens-aeson lsp-test lsp-types prettyprinter process row-types text
     unordered-containers
   ];
   testToolDepends = [ ghcide ];
diff --git a/pkgs/haskell-lexer.nix b/pkgs/haskell-lexer.nix
deleted file mode 100644
index 2e8e413b24dcd0a58f689e758a0829332c54bb21..0000000000000000000000000000000000000000
--- a/pkgs/haskell-lexer.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "haskell-lexer";
-  version = "1.1.1";
-  sha256 = "c8eeda569a30f115244c17920247ba2c45d11b3e30805f648a878f7855d8f349";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yav/haskell-lexer";
-  description = "A fully compliant Haskell 98 lexer";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/haskell-src-exts.nix b/pkgs/haskell-src-exts.nix
deleted file mode 100644
index 2b3fe90fc5e20448d920692862fc9d8d7e10f938..0000000000000000000000000000000000000000
--- a/pkgs/haskell-src-exts.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, array, base, containers, directory, filepath
-, ghc-prim, happy, lib, mtl, pretty, pretty-show, smallcheck, tasty
-, tasty-golden, tasty-smallcheck
-}:
-mkDerivation {
-  pname = "haskell-src-exts";
-  version = "1.23.1";
-  sha256 = "67853047169fff7d3e5d87acef214ee185a6ab8c6a104ed9c59e389574cf6c05";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base ghc-prim pretty ];
-  libraryToolDepends = [ happy ];
-  testHaskellDepends = [
-    base containers directory filepath mtl pretty-show smallcheck tasty
-    tasty-golden tasty-smallcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-suite/haskell-src-exts";
-  description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/haskell-src-meta.nix b/pkgs/haskell-src-meta.nix
deleted file mode 100644
index bb85315a4b3986d5832c448528d877d296ea5de6..0000000000000000000000000000000000000000
--- a/pkgs/haskell-src-meta.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, base, containers, haskell-src-exts, lib
-, pretty, syb, tasty, tasty-hunit, template-haskell, th-orphans
-}:
-mkDerivation {
-  pname = "haskell-src-meta";
-  version = "0.8.12";
-  sha256 = "027819e7caffef8812176d89952d6946115caba271e2b919ba5ec19f13d9ba89";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base haskell-src-exts pretty syb template-haskell th-orphans
-  ];
-  testHaskellDepends = [
-    base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit
-    template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Parse source to template-haskell abstract syntax";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hasql.nix b/pkgs/hasql.nix
index f276990de0e9d485f660b0713afde7c309272735..eb06b24e5e24dd1109e0df7ac61c02827430314c 100644
--- a/pkgs/hasql.nix
+++ b/pkgs/hasql.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, QuickCheck, aeson, attoparsec, base, bytestring
+{ mkDerivation, aeson, attoparsec, base, bytestring
 , bytestring-strict-builder, contravariant, contravariant-extras
 , dlist, gauge, hashable, hashtables, lib, mtl, network-ip
 , postgresql-binary, postgresql-libpq, profunctors
@@ -8,8 +8,8 @@
 }:
 mkDerivation {
   pname = "hasql";
-  version = "1.6.3";
-  sha256 = "d25a009d0f8bb5319f773808e65a059685b0274fa68a01a4c6ce5d4484baa411";
+  version = "1.6.3.3";
+  sha256 = "043b7afa97ea10717e3339a3eb00b4cf7959f637c3bab2c26ddf7a497cbc94f0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,7 +20,7 @@ mkDerivation {
     text-builder time transformers uuid vector
   ];
   testHaskellDepends = [
-    contravariant-extras QuickCheck quickcheck-instances rerebase tasty
+    contravariant-extras quickcheck-instances rerebase tasty
     tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ gauge rerebase ];
diff --git a/pkgs/hdaemonize.nix b/pkgs/hdaemonize.nix
index 7d2196ae0a36ecd0046b93d4b8bbc5a32982b1e7..f898639401e45b02b106639f59cd4915f1748a47 100644
--- a/pkgs/hdaemonize.nix
+++ b/pkgs/hdaemonize.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "hdaemonize";
-  version = "0.5.6";
-  sha256 = "ad6f302492a9c41e99ce62ca955a959b0cdca0ff328e66f31bfec5a99f7cee24";
+  version = "0.5.7";
+  sha256 = "748823288eec23252335c00576384fc322e4f91c8e86f456530ba5d7c727f01b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/headed-megaparsec.nix b/pkgs/headed-megaparsec.nix
index ea6ed8741935017ec393ccf57544136080487bde..5540d98dccaa5d68eea6f3eefb707a155173a82d 100644
--- a/pkgs/headed-megaparsec.nix
+++ b/pkgs/headed-megaparsec.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "headed-megaparsec";
-  version = "0.2.1.1";
-  sha256 = "34f75cedd58d71d983c235f7c9bf3f89302798c365359ecb696b26c0dffbfbbb";
+  version = "0.2.1.2";
+  sha256 = "8109bd100d4100182369fc26cb2bef1d2908d4a72aadf4457bd0387d67b809cd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hedgehog-extras.nix b/pkgs/hedgehog-extras.nix
index 7b953ca3f3ade10fef24a9f62f350ded3ff4a392..22047c9cabc2d2ccdaf2dbb891e708a35c1b9f9a 100644
--- a/pkgs/hedgehog-extras.nix
+++ b/pkgs/hedgehog-extras.nix
@@ -1,21 +1,21 @@
 { mkDerivation, Diff, aeson, aeson-pretty, async, base, bytestring
 , deepseq, directory, exceptions, filepath, hedgehog, http-conduit
-, hw-aeson, lib, mmorph, mtl, network, process, resourcet, stm, tar
+, lib, mmorph, mtl, network, process, resourcet, stm, tar
 , temporary, text, time, transformers, unliftio
 , unordered-containers, yaml, zlib
 }:
 mkDerivation {
   pname = "hedgehog-extras";
-  version = "0.4.5.1";
-  sha256 = "1016afe36cf0fc1b2a83baafd2920b7643391cf927d46c85044569b9d3431ee3";
+  version = "0.4.7.1";
+  sha256 = "3d2954651c33f07ae9a4d13fb6a3bb55db99b9493f7f2dccce9516e8eaad360e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson aeson-pretty async base bytestring deepseq Diff directory
-    exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl
-    network process resourcet stm tar temporary text time transformers
-    unliftio unordered-containers yaml zlib
+    exceptions filepath hedgehog http-conduit mmorph mtl network
+    process resourcet stm tar temporary text time transformers unliftio
+    unordered-containers yaml zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hedgehog-quickcheck.nix b/pkgs/hedgehog-quickcheck.nix
index 94c60d66cc496ff7c8a2973163f2009adbe5c365..8ff24c4f9e9ebb86f501f7c7f4ecdf4d7a8d797d 100644
--- a/pkgs/hedgehog-quickcheck.nix
+++ b/pkgs/hedgehog-quickcheck.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "hedgehog-quickcheck";
   version = "0.1.1";
   sha256 = "97b65db815fdfaacc7c4d06a7b9b74680b50264afa03f839c4037dcc875152fc";
-  revision = "4";
-  editedCabalFile = "1838hm2p22n8qrps17zjzf9k0jwvrw9g99r0crii3igfbi22m8nf";
+  revision = "6";
+  editedCabalFile = "0ymfpbnywq83xbz1rmp8w3piikgvzriczwcvhir125nk50mgp0xz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hedgehog.nix b/pkgs/hedgehog.nix
deleted file mode 100644
index 697017e0b941ae17edd442e6d2648f70162ceea8..0000000000000000000000000000000000000000
--- a/pkgs/hedgehog.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, ansi-terminal, async, barbies, base, bytestring
-, concurrent-output, containers, deepseq, directory, erf
-, exceptions, lib, lifted-async, mmorph, monad-control, mtl
-, pretty-show, primitive, random, resourcet, stm, template-haskell
-, text, time, transformers, transformers-base, wl-pprint-annotated
-}:
-mkDerivation {
-  pname = "hedgehog";
-  version = "1.2";
-  sha256 = "2859c7daa665250bb249614da7b55507c6315d9b80e456f1a74f33abfeaf8e7e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal async barbies base bytestring concurrent-output
-    containers deepseq directory erf exceptions lifted-async mmorph
-    monad-control mtl pretty-show primitive random resourcet stm
-    template-haskell text time transformers transformers-base
-    wl-pprint-annotated
-  ];
-  testHaskellDepends = [
-    base containers mmorph mtl pretty-show text transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hedgehog.qa";
-  description = "Release with confidence";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hex-text.nix b/pkgs/hex-text.nix
index 4c8ae6f90dc2056af9387f0bf66c2214c493c6d7..31cf8be2b96a2b715eb3c32862f04e03cfa1c513 100644
--- a/pkgs/hex-text.nix
+++ b/pkgs/hex-text.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "hex-text";
-  version = "0.1.0.8";
-  sha256 = "653924681d94db1e7e8ed9b3be209d17a0fd032683192084d62ee9b6394cf71b";
-  revision = "1";
-  editedCabalFile = "1w1hwzfhaphdbrnbqwn48v2jh7my280nisn7z98asidq77gi0lsl";
+  version = "0.1.0.9";
+  sha256 = "c55b28f5567b1c86e902aaa158a8adc095fd2db40566be7ad696a827af0cfbb7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hie-compat.nix b/pkgs/hie-compat.nix
index 242df9039a6aa9d92d71755f8cc531746e905112..4fbcee98385ca0e1bdbdf11fb5ff04df32778a32 100644
--- a/pkgs/hie-compat.nix
+++ b/pkgs/hie-compat.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "hie-compat";
-  version = "0.3.1.0";
-  sha256 = "e1e8a54273ceb50f71ab329c60d3a2cf70e03431bdbf1056970a95845c0fb347";
-  revision = "1";
-  editedCabalFile = "1dr9cqqmxq6dwsdbmm7q4a26ghsnq66yl49wy54dpyln5xzz4234";
+  version = "0.3.1.1";
+  sha256 = "5b1a16d4b9171b06868767669eed4c58605466acbbcbc5d16f69efe7354f4737";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hiedb.nix b/pkgs/hiedb.nix
index e47b1d213f784d7d60a204bbf522d840bdfdc6f6..d56aa366115b569e2ee784eeb921fa244f11d007 100644
--- a/pkgs/hiedb.nix
+++ b/pkgs/hiedb.nix
@@ -1,15 +1,18 @@
 { mkDerivation, algebraic-graphs, ansi-terminal, array, base
-, bytestring, containers, directory, extra, filepath, ghc
+, bytestring, containers, directory, extra, fetchgit, filepath, ghc
 , ghc-paths, hie-compat, hspec, lib, lucid, mtl
 , optparse-applicative, process, sqlite-simple, temporary
 , terminal-size, text
 }:
 mkDerivation {
   pname = "hiedb";
-  version = "0.4.3.0";
-  sha256 = "609c200782f79120dbb77d0dc26f6db0dda5e976ef1855d3d19024d23fbbbe06";
-  revision = "1";
-  editedCabalFile = "0yaxg7463625spx0dxg4znzyl8zq93mnb393wp6x11n29jd3l20r";
+  version = "0.4.4.0";
+  src = fetchgit {
+    url = "https://github.com/wz1000/HieDB";
+    sha256 = "15sq6dqf2294ymdcwffhigdq31ci50jh2vk8hpnyqhm1bvvbmlh9";
+    rev = "62ef191df2c1ce3324c2dfc2f2a574863642435d";
+    fetchSubmodules = true;
+  };
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hledger-lib.nix b/pkgs/hledger-lib.nix
deleted file mode 100644
index 3eaa2d901ba7ab56ad74f557afab683b127a2ab6..0000000000000000000000000000000000000000
--- a/pkgs/hledger-lib.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ mkDerivation, Decimal, Glob, aeson, aeson-pretty, ansi-terminal
-, array, base, base-compat, blaze-markup, bytestring, call-stack
-, cassava, cassava-megaparsec, cmdargs, colour, containers
-, data-default, deepseq, directory, doclayout, doctest, extra
-, file-embed, filepath, hashtables, lib, megaparsec, microlens
-, microlens-th, mtl, pager, parser-combinators, pretty-simple
-, regex-tdfa, safe, tabular, tasty, tasty-hunit, template-haskell
-, text, text-ansi, time, timeit, transformers, uglymemo
-, unordered-containers, utf8-string
-}:
-mkDerivation {
-  pname = "hledger-lib";
-  version = "1.29.1";
-  sha256 = "cc20a32cad515ac87d48d1e4647525353089f41e163ce6675085e57a8f52c9a2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson aeson-pretty ansi-terminal array base base-compat
-    blaze-markup bytestring call-stack cassava cassava-megaparsec
-    cmdargs colour containers data-default Decimal deepseq directory
-    doclayout extra file-embed filepath Glob hashtables megaparsec
-    microlens microlens-th mtl pager parser-combinators pretty-simple
-    regex-tdfa safe tabular tasty tasty-hunit template-haskell text
-    text-ansi time timeit transformers uglymemo unordered-containers
-    utf8-string
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty ansi-terminal array base base-compat
-    blaze-markup bytestring call-stack cassava cassava-megaparsec
-    cmdargs colour containers data-default Decimal deepseq directory
-    doclayout doctest extra file-embed filepath Glob hashtables
-    megaparsec microlens microlens-th mtl pager parser-combinators
-    pretty-simple regex-tdfa safe tabular tasty tasty-hunit
-    template-haskell text text-ansi time timeit transformers uglymemo
-    unordered-containers utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://hledger.org";
-  description = "A reusable library providing the core functionality of hledger";
-  license = lib.licenses.gpl3Only;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hledger.nix b/pkgs/hledger.nix
deleted file mode 100644
index de8d5cb30acf5bfc67a5901c3ba7def5ef418c79..0000000000000000000000000000000000000000
--- a/pkgs/hledger.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ mkDerivation, Decimal, Diff, aeson, ansi-terminal, base
-, bytestring, cmdargs, containers, data-default, directory, extra
-, filepath, githash, hashable, haskeline, hledger-lib, lib, lucid
-, math-functions, megaparsec, microlens, mtl, process, regex-tdfa
-, safe, shakespeare, split, tabular, tasty, temporary, terminfo
-, text, text-ansi, time, timeit, transformers, unordered-containers
-, utf8-string, utility-ht, wizards
-}:
-mkDerivation {
-  pname = "hledger";
-  version = "1.29.1";
-  sha256 = "251ee8a7ebfaa3d39bd964a86a4cc9f6edad1b168b7ec392f16f7a4474b2f27f";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson ansi-terminal base bytestring cmdargs containers data-default
-    Decimal Diff directory extra filepath githash hashable haskeline
-    hledger-lib lucid math-functions megaparsec microlens mtl process
-    regex-tdfa safe shakespeare split tabular tasty temporary terminfo
-    text text-ansi time timeit transformers unordered-containers
-    utf8-string utility-ht wizards
-  ];
-  executableHaskellDepends = [
-    aeson ansi-terminal base bytestring cmdargs containers data-default
-    Decimal directory extra filepath githash haskeline hledger-lib
-    math-functions megaparsec microlens mtl process regex-tdfa safe
-    shakespeare split tabular tasty temporary terminfo text text-ansi
-    time timeit transformers unordered-containers utf8-string
-    utility-ht wizards
-  ];
-  testHaskellDepends = [
-    aeson ansi-terminal base bytestring cmdargs containers data-default
-    Decimal directory extra filepath githash haskeline hledger-lib
-    math-functions megaparsec microlens mtl process regex-tdfa safe
-    shakespeare split tabular tasty temporary terminfo text text-ansi
-    time timeit transformers unordered-containers utf8-string
-    utility-ht wizards
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://hledger.org";
-  description = "Command-line interface for the hledger accounting system";
-  license = lib.licenses.gpl3Only;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hlint.nix b/pkgs/hlint.nix
index befdfabcf4e4a635c4acb4fa914b1e4ef6316ada..e5169e51e64b6b822acc75168d277d823cefc6d4 100644
--- a/pkgs/hlint.nix
+++ b/pkgs/hlint.nix
@@ -7,8 +7,8 @@
 }:
 mkDerivation {
   pname = "hlint";
-  version = "3.5";
-  sha256 = "98bd120a10a086c17d6bf1176a510dc12b36581e5a901f1e024555bb3ccead4f";
+  version = "3.6.1";
+  sha256 = "3280132bb3c1b39faa4c8c6a937479d4622484914da6a227a2ce4b15a76741fd";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
diff --git a/pkgs/hls-alternate-number-format-plugin.nix b/pkgs/hls-alternate-number-format-plugin.nix
index cfbdece5a526f85801f3fe5847e2a465eba784d6..b6e3bfb511b39e557a102520a2b9cd16c65e298d 100644
--- a/pkgs/hls-alternate-number-format-plugin.nix
+++ b/pkgs/hls-alternate-number-format-plugin.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "hls-alternate-number-format-plugin";
-  version = "2.0.0.1";
-  sha256 = "ca0815ba0764961fe445128410a5e92e150f1ab09380ff9e50483f897ce45fef";
+  version = "2.4.0.0";
+  sha256 = "357276a8afec8dbc8d32d974353bfa6e8d8a206e7fe4ec20a3f4c86c19987070";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hls-cabal-fmt-plugin.nix b/pkgs/hls-cabal-fmt-plugin.nix
index 55afe137b7d5db4319cf5da069353668922ea8b6..38648a0d6eba28eefea3b6dd09e6dea5f88376d9 100644
--- a/pkgs/hls-cabal-fmt-plugin.nix
+++ b/pkgs/hls-cabal-fmt-plugin.nix
@@ -1,16 +1,17 @@
 { mkDerivation, base, directory, filepath, ghcide, hls-plugin-api
-, hls-test-utils, lens, lib, lsp-types, process, text, transformers
+, hls-test-utils, lens, lib, lsp-types, mtl, process-extras, text
+, transformers
 }:
 mkDerivation {
   pname = "hls-cabal-fmt-plugin";
-  version = "2.0.0.1";
-  sha256 = "13318921a9587c15b7295953d61c71b6919b116fb3e935f8d3d8b22045b7bcda";
+  version = "2.4.0.0";
+  sha256 = "79630cd9fdf28b8aa49acbdb4389489a4f99137b87f6ef4ce44be013cd9263bf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base directory filepath ghcide hls-plugin-api lens lsp-types
-    process text transformers
+    base directory filepath ghcide hls-plugin-api lens lsp-types mtl
+    process-extras text transformers
   ];
   testHaskellDepends = [ base directory filepath hls-test-utils ];
   enableLibraryProfiling = true;
diff --git a/pkgs/hls-cabal-plugin.nix b/pkgs/hls-cabal-plugin.nix
index 00e2852cc566fd07c8b74e5750f6babd18c315f1..f3a039bd7ad778a03729df355aa8a2d2ef1b37b7 100644
--- a/pkgs/hls-cabal-plugin.nix
+++ b/pkgs/hls-cabal-plugin.nix
@@ -1,23 +1,26 @@
-{ mkDerivation, Cabal, base, bytestring, deepseq, directory, extra
-, filepath, ghcide, hashable, hls-graph, hls-plugin-api
-, hls-test-utils, lens, lib, lsp, lsp-types, regex-tdfa, stm
-, tasty-hunit, text, unordered-containers
+{ mkDerivation, Cabal-syntax, base, bytestring, containers, deepseq
+, directory, extra, filepath, ghcide, hashable, hls-graph
+, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types
+, regex-tdfa, row-types, stm, tasty-hunit, text, text-rope
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-cabal-plugin";
-  version = "2.0.0.1";
-  sha256 = "eb48b1e44670c6344ef67e53b60658f23f70dd4f52c5421521b89bc04c63ec9f";
+  version = "2.4.0.0";
+  sha256 = "2337bf878ccf6e5e40b285e60dfa364b6f91b8785451b3f74320eaa75b71b59e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring Cabal deepseq directory extra ghcide hashable
-    hls-graph hls-plugin-api lsp lsp-types regex-tdfa stm text
+    base bytestring Cabal-syntax containers deepseq directory extra
+    filepath ghcide hashable hls-graph hls-plugin-api lens lsp
+    lsp-types regex-tdfa stm text text-rope transformers
     unordered-containers
   ];
   testHaskellDepends = [
-    base bytestring filepath ghcide hls-test-utils lens lsp-types
-    tasty-hunit text
+    base bytestring Cabal-syntax directory filepath ghcide
+    hls-test-utils lens lsp lsp-types row-types tasty-hunit text
+    text-rope transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-call-hierarchy-plugin.nix b/pkgs/hls-call-hierarchy-plugin.nix
index cfc6b4c356df583cf7246f6b8af5b5543194b2a3..eb5c99430b86d51b2ee4394d7868164b818acf9a 100644
--- a/pkgs/hls-call-hierarchy-plugin.nix
+++ b/pkgs/hls-call-hierarchy-plugin.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "hls-call-hierarchy-plugin";
-  version = "2.0.0.1";
-  sha256 = "2c4c9da2a234de1534a6f594792ed6244303c4ff3326e32eb4ebcc2437af83ad";
+  version = "2.4.0.0";
+  sha256 = "80dee57ad447ee4419990c6af008f080d0b3506d1b79c2692fd62714459ff20f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hls-change-type-signature-plugin.nix b/pkgs/hls-change-type-signature-plugin.nix
index f4d88b472f02828245d84aea75fe67864cca3065..43cefc6a2f49238c53fbcf4f72844d1010e220f4 100644
--- a/pkgs/hls-change-type-signature-plugin.nix
+++ b/pkgs/hls-change-type-signature-plugin.nix
@@ -1,16 +1,16 @@
-{ mkDerivation, QuickCheck, base, filepath, ghcide, hls-plugin-api
-, hls-test-utils, lib, lsp, lsp-types, regex-tdfa, syb, text
-, transformers, unordered-containers
+{ mkDerivation, QuickCheck, base, containers, filepath, ghcide
+, hls-plugin-api, hls-test-utils, lib, lsp, lsp-types, regex-tdfa
+, syb, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-change-type-signature-plugin";
-  version = "2.0.0.1";
-  sha256 = "a54e477a302e3775af1dc7a64fd1055a4fee5271842f9a2cad2323aae59c4cd6";
+  version = "2.4.0.0";
+  sha256 = "28706cc57dfcb41ec797518819dbdeb92881ff1efa7b088b301a7e4fe732e9c3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base ghcide hls-plugin-api lsp-types regex-tdfa syb text
+    base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text
     transformers unordered-containers
   ];
   testHaskellDepends = [
diff --git a/pkgs/hls-class-plugin.nix b/pkgs/hls-class-plugin.nix
index 4fd8f4a5f1a68cb890334753380b748ca39333ea..26a92f7c855ca6f05760048bea8cec7c453a3087 100644
--- a/pkgs/hls-class-plugin.nix
+++ b/pkgs/hls-class-plugin.nix
@@ -1,22 +1,22 @@
 { mkDerivation, aeson, base, containers, deepseq, extra, filepath
 , ghc, ghc-boot-th, ghc-exactprint, ghcide, hls-graph
-, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types, text
-, transformers
+, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types, mtl
+, row-types, text, transformers
 }:
 mkDerivation {
   pname = "hls-class-plugin";
-  version = "2.0.0.1";
-  sha256 = "44c5b7e94a65d56f79bb4430f0b5284a9946b0892766c196d1edab80af22b7c2";
+  version = "2.4.0.0";
+  sha256 = "c4b4a6f38ce86bb850084cd5e2422447d31406f30eb1566c84f448a5ab1863e2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint
-    ghcide hls-graph hls-plugin-api lens lsp text transformers
+    ghcide hls-graph hls-plugin-api lens lsp mtl text transformers
   ];
   testHaskellDepends = [
     aeson base filepath ghcide hls-plugin-api hls-test-utils lens
-    lsp-types text
+    lsp-types row-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-code-range-plugin.nix b/pkgs/hls-code-range-plugin.nix
index 0fa5c18975e62acb35e433b387962d4adae214d6..5f366a9a733d0e676174c8f65753263c86a62793 100644
--- a/pkgs/hls-code-range-plugin.nix
+++ b/pkgs/hls-code-range-plugin.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "hls-code-range-plugin";
-  version = "2.0.0.1";
-  sha256 = "f1d4bd7164f1dd60222402438eef724a82b8cdb2cef2669860174641a7fc7ca7";
+  version = "2.4.0.0";
+  sha256 = "6acaa7421a4ce10a71833638573d8ae50ad3111398ea6e0127288e239e4b2e52";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,8 +15,9 @@ mkDerivation {
     lens lsp mtl semigroupoids text transformers vector
   ];
   testHaskellDepends = [
-    base bytestring containers filepath ghcide hls-test-utils lens lsp
-    lsp-test tasty-hunit text transformers vector
+    base bytestring containers filepath ghcide hls-plugin-api
+    hls-test-utils lens lsp lsp-test tasty-hunit text transformers
+    vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-explicit-fixity-plugin.nix b/pkgs/hls-explicit-fixity-plugin.nix
index 2f96fd156e35997b975d5c53183849907a4e45fe..2524ee683a8b7ed3e4890a0e64474ffa2ee04adc 100644
--- a/pkgs/hls-explicit-fixity-plugin.nix
+++ b/pkgs/hls-explicit-fixity-plugin.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "hls-explicit-fixity-plugin";
-  version = "2.0.0.1";
-  sha256 = "b59e154bfbc54cea238456524a12ac1b72041f779a4c21845244f35f1e8235d7";
+  version = "2.4.0.0";
+  sha256 = "5ec08b247db79896d80c240f56f807e7ee443c5ef53ae4635e201154bd26a06d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hls-explicit-imports-plugin.nix b/pkgs/hls-explicit-imports-plugin.nix
index b910a57de375fd412674da8f43fb9f561e952330..8f061f607a25f470d732540af1c952ec93fc8d53 100644
--- a/pkgs/hls-explicit-imports-plugin.nix
+++ b/pkgs/hls-explicit-imports-plugin.nix
@@ -1,19 +1,22 @@
-{ mkDerivation, aeson, base, containers, deepseq, filepath, ghc
-, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lib, lsp, text
+{ mkDerivation, aeson, base, containers, deepseq, extra, filepath
+, ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lens, lib
+, lsp, lsp-types, mtl, row-types, text, transformers
 , unordered-containers
 }:
 mkDerivation {
   pname = "hls-explicit-imports-plugin";
-  version = "2.0.0.1";
-  sha256 = "3d5877c7a96704ddb90bb9f7392c3e40e6cc189b62ee5b1bd04a633ac0e3e640";
+  version = "2.4.0.0";
+  sha256 = "ca026cb615a667095807a819cff9436da66dd79b59ac6e50bc213e7b3384bc9c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api
-    lsp text unordered-containers
+    lens lsp mtl text transformers unordered-containers
+  ];
+  testHaskellDepends = [
+    base extra filepath hls-test-utils lens lsp-types row-types text
   ];
-  testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/hls-explicit-record-fields-plugin.nix b/pkgs/hls-explicit-record-fields-plugin.nix
index b55948995d2804a4631970eb3ac45d921d41294c..c209a4e77a783c77a0b507f4ddd1bec447971a0d 100644
--- a/pkgs/hls-explicit-record-fields-plugin.nix
+++ b/pkgs/hls-explicit-record-fields-plugin.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, base, containers, filepath, ghc-boot-th, ghcide
-, hls-graph, hls-plugin-api, hls-test-utils, lens, lib, lsp
+{ mkDerivation, aeson, base, containers, filepath, ghc, ghc-boot-th
+, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lens, lib, lsp
 , lsp-test, syb, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-explicit-record-fields-plugin";
-  version = "2.0.0.1";
-  sha256 = "e189bf4f12c6bec9748f1c447aed2e3a3367d7d42550e88e43a08498e86e8394";
+  version = "2.4.0.0";
+  sha256 = "9c8b90c2ae9c886e811dd228302d83c67ea8aa537e60afd9f546a4eced3cac98";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base containers ghc-boot-th ghcide hls-graph hls-plugin-api lens
-    lsp syb text transformers unordered-containers
+    aeson base containers ghc ghc-boot-th ghcide hls-graph
+    hls-plugin-api lens lsp syb text transformers unordered-containers
   ];
   testHaskellDepends = [
     base filepath hls-test-utils lsp-test text
diff --git a/pkgs/hls-fourmolu-plugin.nix b/pkgs/hls-fourmolu-plugin.nix
index ed46e3b1a496332c6e5998ea10e8dca0012a95ad..6b035845ffc57f5a7bb5e58b1930f7fc1f8a3f87 100644
--- a/pkgs/hls-fourmolu-plugin.nix
+++ b/pkgs/hls-fourmolu-plugin.nix
@@ -1,17 +1,17 @@
 { mkDerivation, aeson, base, containers, filepath, fourmolu, ghc
 , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lib
-, lsp, lsp-test, process-extras, text
+, lsp, lsp-test, mtl, process-extras, text, transformers
 }:
 mkDerivation {
   pname = "hls-fourmolu-plugin";
-  version = "2.0.0.1";
-  sha256 = "c8238e4fb20aa4fd958c48b6b001b17e2d3c9d2938480136eed7f93f119833a5";
+  version = "2.4.0.0";
+  sha256 = "2b3b287559d2f01e24cba8206212340e5a2d6431c0a8cc962e7f209776737d84";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens
-    lsp process-extras text
+    lsp mtl process-extras text transformers
   ];
   testHaskellDepends = [
     aeson base containers filepath hls-plugin-api hls-test-utils
diff --git a/pkgs/hls-gadt-plugin.nix b/pkgs/hls-gadt-plugin.nix
index a09ef96fcd00b0fd9f9b299be02f8b989ea79aeb..851fd379052569bd5f77ef94e216a0280321657f 100644
--- a/pkgs/hls-gadt-plugin.nix
+++ b/pkgs/hls-gadt-plugin.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "hls-gadt-plugin";
-  version = "2.0.0.1";
-  sha256 = "afdccf8dd43166934036d221c4ce845df876908515c4ec5b945efe04f9b74bdd";
+  version = "2.4.0.0";
+  sha256 = "f2c291ff57ef714be2ad977914ee32aad40fe8d3b46050380bd50431117f1bc2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hls-graph.nix b/pkgs/hls-graph.nix
index 9c365997bba8fadbb4f884597da5a56a0f495f46..48ed3bec9a4880a67d6735ce44614361f4e0fbe8 100644
--- a/pkgs/hls-graph.nix
+++ b/pkgs/hls-graph.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "hls-graph";
-  version = "2.0.0.1";
-  sha256 = "cc6227f7c8ab9c615e088a88c28f24df81205ea71be05d94a6bda8299785704d";
+  version = "2.4.0.0";
+  sha256 = "45c894264be5710a6b0c569a8bc35630d515ea92bcca805fe6e2551348723a41";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/hls-hlint-plugin.nix b/pkgs/hls-hlint-plugin.nix
index f21b4738aaedcc32345d123688a1bae729819318..6225cf15b70a60c083f51a66b3b09fca23862053 100644
--- a/pkgs/hls-hlint-plugin.nix
+++ b/pkgs/hls-hlint-plugin.nix
@@ -2,26 +2,26 @@
 , containers, data-default, deepseq, directory, extra, filepath
 , ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex, ghcide
 , hashable, hlint, hls-plugin-api, hls-test-utils, lens, lib, lsp
-, lsp-types, refact, regex-tdfa, stm, temporary, text, transformers
-, unordered-containers
+, lsp-types, mtl, refact, regex-tdfa, row-types, stm, temporary
+, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-hlint-plugin";
-  version = "2.0.0.1";
-  sha256 = "605ec799dd3a99783a9be19f2188b110098e923784c22a0edeaee0adbac82c5b";
+  version = "2.4.0.0";
+  sha256 = "b36f4ff71a741b5d503496f771c42c097d378c05316a0fc6edd22a537595ce8c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson apply-refact base binary bytestring containers data-default
     deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser
-    ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api lens lsp
+    ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api lens lsp mtl
     refact regex-tdfa stm temporary text transformers
     unordered-containers
   ];
   testHaskellDepends = [
     aeson base containers filepath hls-plugin-api hls-test-utils lens
-    lsp-types text
+    lsp-types row-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-module-name-plugin.nix b/pkgs/hls-module-name-plugin.nix
index 527d1627bc8040a4b032b829354d7f2ea6ceb829..8a179fe1bd8a199e353a6eba1afcc72813b816f8 100644
--- a/pkgs/hls-module-name-plugin.nix
+++ b/pkgs/hls-module-name-plugin.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, aeson, base, directory, filepath, ghcide
-, hls-plugin-api, hls-test-utils, lib, lsp, text, transformers
-, unordered-containers
+{ mkDerivation, aeson, base, containers, directory, filepath
+, ghcide, hls-plugin-api, hls-test-utils, lib, lsp, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-module-name-plugin";
-  version = "2.0.0.1";
-  sha256 = "f0b23f0591b6cc33434fe2ae49cfb746cf5091f8d5326de6964d1d65eb119d78";
+  version = "2.4.0.0";
+  sha256 = "793e507aed297852234a9e9a0e9b731a2cdb752e046e6b155c13c267cb03b206";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson base directory filepath ghcide hls-plugin-api lsp text
-    transformers unordered-containers
+    aeson base containers directory filepath ghcide hls-plugin-api lsp
+    text transformers unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils ];
   enableLibraryProfiling = true;
diff --git a/pkgs/hls-overloaded-record-dot-plugin.nix b/pkgs/hls-overloaded-record-dot-plugin.nix
index 6d630e7756d79f2045be1451a37b95da069ca135..3366cc918facc7778f70fd81a5d8900d3f7e8378 100644
--- a/pkgs/hls-overloaded-record-dot-plugin.nix
+++ b/pkgs/hls-overloaded-record-dot-plugin.nix
@@ -1,20 +1,22 @@
-{ mkDerivation, base, containers, deepseq, filepath, ghc-boot-th
-, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lens, lib, lsp
-, lsp-test, syb, text, transformers, unordered-containers
+{ mkDerivation, aeson, base, containers, deepseq, filepath
+, ghc-boot-th, ghcide, hls-graph, hls-plugin-api, hls-test-utils
+, lens, lib, lsp, lsp-test, lsp-types, row-types, syb, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-overloaded-record-dot-plugin";
-  version = "2.0.0.1";
-  sha256 = "caa5f7e5827081d445f6ea8a7ea6124f4e068ba3a63a4e6f9d19b54c018f95c6";
+  version = "2.4.0.0";
+  sha256 = "0401108b10d5e605e7cd22fde78ca9a51e9606981e94d428df5683ee04d1d909";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api
-    lens lsp syb text transformers unordered-containers
+    aeson base containers deepseq ghc-boot-th ghcide hls-graph
+    hls-plugin-api lens lsp syb text transformers unordered-containers
   ];
   testHaskellDepends = [
-    base filepath hls-test-utils lsp-test text
+    base filepath ghcide hls-plugin-api hls-test-utils lens lsp-test
+    lsp-types row-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-plugin-api.nix b/pkgs/hls-plugin-api.nix
index b561954d94c306d2f60852ce80f89e69883d49fa..bf4606a2dd7b8c25bc598f7250293012dbebb62d 100644
--- a/pkgs/hls-plugin-api.nix
+++ b/pkgs/hls-plugin-api.nix
@@ -1,23 +1,25 @@
-{ mkDerivation, Diff, aeson, base, containers, criterion
-, data-default, deepseq, dependent-map, dependent-sum, dlist, extra
-, filepath, ghc, hashable, hls-graph, hw-fingertree, lens
-, lens-aeson, lib, lsp, lsp-types, megaparsec, opentelemetry
-, optparse-applicative, random, random-fu, regex-tdfa, tasty
-, tasty-hunit, tasty-quickcheck, tasty-rerun, text, transformers
-, unix, unordered-containers
+{ mkDerivation, Diff, aeson, base, co-log-core, containers
+, criterion, data-default, deepseq, dependent-map, dependent-sum
+, dlist, extra, filepath, ghc, hashable, hls-graph, hw-fingertree
+, lens, lens-aeson, lib, lsp, lsp-types, megaparsec, mtl
+, opentelemetry, optparse-applicative, prettyprinter, random
+, random-fu, regex-tdfa, row-types, stm, tasty, tasty-hunit
+, tasty-quickcheck, tasty-rerun, text, time, transformers, unix
+, unliftio, unordered-containers
 }:
 mkDerivation {
   pname = "hls-plugin-api";
-  version = "2.0.0.1";
-  sha256 = "c9973ca7f9678b7ba98c4b45a38d7d4a7bbb6b6de63cc5193f6d23eacfd750e5";
+  version = "2.4.0.0";
+  sha256 = "1e7f703183db2795d21dab2291cbdc3f2c4d4dd566c8e2e70cb3159ba0ee16fb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson base containers data-default dependent-map dependent-sum Diff
-    dlist extra filepath ghc hashable hls-graph hw-fingertree lens
-    lens-aeson lsp megaparsec opentelemetry optparse-applicative
-    regex-tdfa text transformers unix unordered-containers
+    aeson base co-log-core containers data-default dependent-map
+    dependent-sum Diff dlist extra filepath ghc hashable hls-graph
+    hw-fingertree lens lens-aeson lsp megaparsec mtl opentelemetry
+    optparse-applicative prettyprinter regex-tdfa row-types stm text
+    time transformers unix unliftio unordered-containers
   ];
   testHaskellDepends = [
     base containers lsp-types tasty tasty-hunit tasty-quickcheck
diff --git a/pkgs/hls-pragmas-plugin.nix b/pkgs/hls-pragmas-plugin.nix
index 6dfe3e26be03a806b49cff0f05a303e120289fed..f1ec62053f7992afd32d7292168e9f85f76f62ad 100644
--- a/pkgs/hls-pragmas-plugin.nix
+++ b/pkgs/hls-pragmas-plugin.nix
@@ -1,11 +1,11 @@
-{ mkDerivation, base, containers, extra, filepath, fuzzy, ghc
-, ghcide, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types
-, text, transformers, unordered-containers
+{ mkDerivation, aeson, base, containers, extra, filepath, fuzzy
+, ghc, ghcide, hls-plugin-api, hls-test-utils, lens, lib, lsp
+, lsp-types, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-pragmas-plugin";
-  version = "2.0.0.1";
-  sha256 = "a482f14a787dec6bd5873ffefe8d2aa876265d64c4621404226393ff0d39f8d5";
+  version = "2.4.0.0";
+  sha256 = "32753f991a9053fa626a70e38870d7250c14d2e1e64061320cf5080146299e11";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,7 +14,7 @@ mkDerivation {
     transformers unordered-containers
   ];
   testHaskellDepends = [
-    base filepath hls-test-utils lens lsp-types text
+    aeson base filepath hls-test-utils lens lsp-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hls-qualify-imported-names-plugin.nix b/pkgs/hls-qualify-imported-names-plugin.nix
index e293c713942b97ef6cb827c0ef6ef1b1a46ac824..9af7109c8afb94f7672455641721b54c25724f06 100644
--- a/pkgs/hls-qualify-imported-names-plugin.nix
+++ b/pkgs/hls-qualify-imported-names-plugin.nix
@@ -1,17 +1,17 @@
 { mkDerivation, aeson, base, containers, deepseq, dlist, filepath
-, ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lib, lsp
-, text, transformers, unordered-containers
+, ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lens, lib
+, lsp, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-qualify-imported-names-plugin";
-  version = "2.0.0.1";
-  sha256 = "d31cb2b35831bde36fb06e98940f03005e2ee93a32d4ce1d1aaf38b0c2c84365";
+  version = "2.4.0.0";
+  sha256 = "7d4b81682e1c82b37fd331bd12cdf0fe8b48a2e460febd924ea4aedd78b72afe";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base containers deepseq dlist ghc ghcide hls-graph
-    hls-plugin-api lsp text transformers unordered-containers
+    hls-plugin-api lens lsp text transformers unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
diff --git a/pkgs/hls-refactor-plugin.nix b/pkgs/hls-refactor-plugin.nix
index 62b67d53b6f3b73e20578db3ce038693fde391bb..3b55605bc45cb14e126d0aee648e3950303cb872 100644
--- a/pkgs/hls-refactor-plugin.nix
+++ b/pkgs/hls-refactor-plugin.nix
@@ -2,23 +2,23 @@
 , data-default, deepseq, directory, dlist, extra, filepath, ghc
 , ghc-boot, ghc-exactprint, ghcide, ghcide-test-utils, hls-graph
 , hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-test
-, lsp-types, mtl, network-uri, parser-combinators, regex-tdfa
-, retrie, shake, syb, tasty, tasty-expected-failure, tasty-hunit
-, tasty-rerun, text, text-rope, time, transformers
-, unordered-containers
+, lsp-types, mtl, network-uri, parser-combinators
+, regex-applicative, regex-tdfa, retrie, shake, syb, tasty
+, tasty-expected-failure, tasty-hunit, tasty-rerun, text, text-rope
+, time, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-refactor-plugin";
-  version = "2.0.0.1";
-  sha256 = "37a16d097b7cf7551f23e91ce825603d56a3138057d27235f494f8f8948c8773";
+  version = "2.4.0.0";
+  sha256 = "1ed949dabeb56ebbec70e51d5b4489728888459ad3e91d92d76e1ae279b1460b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base bytestring containers data-default deepseq dlist extra
     ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens
-    lsp mtl regex-tdfa retrie syb text text-rope time transformers
-    unordered-containers
+    lsp mtl parser-combinators regex-applicative regex-tdfa retrie syb
+    text text-rope time transformers unordered-containers
   ];
   testHaskellDepends = [
     aeson async base containers data-default directory extra filepath
diff --git a/pkgs/hls-retrie-plugin.nix b/pkgs/hls-retrie-plugin.nix
index 1ea9ed0e275060e21fc4d607a65dbd421af3bc40..fb106a7fc4f2038a2c3c73fac8dfa11abe843c6f 100644
--- a/pkgs/hls-retrie-plugin.nix
+++ b/pkgs/hls-retrie-plugin.nix
@@ -1,19 +1,20 @@
 { mkDerivation, aeson, base, bytestring, containers, deepseq
 , directory, extra, filepath, ghc, ghcide, hashable, hls-plugin-api
-, hls-refactor-plugin, hls-test-utils, lib, lsp, lsp-types, retrie
-, safe-exceptions, stm, text, transformers, unordered-containers
+, hls-refactor-plugin, hls-test-utils, lens, lib, lsp, lsp-types
+, mtl, retrie, safe-exceptions, stm, text, transformers
+, unordered-containers
 }:
 mkDerivation {
   pname = "hls-retrie-plugin";
-  version = "2.0.0.1";
-  sha256 = "c8cd3d861da0f829cda5ac52ab01a3a84f0023a3a2729aa60c1d5d9f914d0467";
+  version = "2.4.0.0";
+  sha256 = "314317515eaccdfbaff89ab23da0dfe73774276272a16cb5c95b314d50819496";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base bytestring containers deepseq directory extra ghc ghcide
-    hashable hls-plugin-api hls-refactor-plugin lsp lsp-types retrie
-    safe-exceptions stm text transformers unordered-containers
+    hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl
+    retrie safe-exceptions stm text transformers unordered-containers
   ];
   testHaskellDepends = [
     aeson base containers filepath hls-plugin-api hls-refactor-plugin
diff --git a/pkgs/hls-splice-plugin.nix b/pkgs/hls-splice-plugin.nix
index 1ecdf0d930136e7d176a8d863124fb20676d1d27..8ccb6687a16b568a506a4cc5d20e2d68c43dfcf0 100644
--- a/pkgs/hls-splice-plugin.nix
+++ b/pkgs/hls-splice-plugin.nix
@@ -1,21 +1,24 @@
 { mkDerivation, aeson, base, containers, dlist, extra, filepath
 , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api
-, hls-refactor-plugin, hls-test-utils, lens, lib, lsp, retrie, syb
-, text, transformers, unliftio-core, unordered-containers
+, hls-refactor-plugin, hls-test-utils, lens, lib, lsp, mtl, retrie
+, row-types, syb, text, transformers, unliftio-core
+, unordered-containers
 }:
 mkDerivation {
   pname = "hls-splice-plugin";
-  version = "2.0.0.1";
-  sha256 = "034799a5a95301b8cf69683371933c6064b374a77f33ed5d44da06d072619269";
+  version = "2.4.0.0";
+  sha256 = "acbeb9d19d8b7d54318847079e18333e0589763e499397cd1965fa48b05c8234";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base containers dlist extra foldl ghc ghc-exactprint ghcide
-    hls-plugin-api hls-refactor-plugin lens lsp retrie syb text
+    hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text
     transformers unliftio-core unordered-containers
   ];
-  testHaskellDepends = [ base filepath hls-test-utils text ];
+  testHaskellDepends = [
+    base filepath hls-test-utils row-types text
+  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/hls-test-utils.nix b/pkgs/hls-test-utils.nix
index 0b7447fd2141efb0cb5d52fedf49a7a93ec15182..3fb1819835a6fe83cd9f76ad08d8d214fb6d688c 100644
--- a/pkgs/hls-test-utils.nix
+++ b/pkgs/hls-test-utils.nix
@@ -1,21 +1,22 @@
 { mkDerivation, aeson, async, base, blaze-markup, bytestring
 , containers, data-default, directory, extra, filepath, ghcide
 , hls-graph, hls-plugin-api, lens, lib, lsp, lsp-test, lsp-types
-, tasty, tasty-expected-failure, tasty-golden, tasty-hunit
-, tasty-rerun, temporary, text, unordered-containers
+, row-types, tasty, tasty-expected-failure, tasty-golden
+, tasty-hunit, tasty-rerun, temporary, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-test-utils";
-  version = "2.0.0.1";
-  sha256 = "7163a00d6e5b65a3d969059b7c1955860d5040924191fc91fee5cdb1290a4468";
+  version = "2.4.0.0";
+  sha256 = "9ccac05eb398d7d4ddd4ababc445323122b79f4f69103544f6eb0ea7a44e8b3a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson async base blaze-markup bytestring containers data-default
     directory extra filepath ghcide hls-graph hls-plugin-api lens lsp
-    lsp-test lsp-types tasty tasty-expected-failure tasty-golden
-    tasty-hunit tasty-rerun temporary text unordered-containers
+    lsp-test lsp-types row-types tasty tasty-expected-failure
+    tasty-golden tasty-hunit tasty-rerun temporary text
+    unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/hoogle.nix b/pkgs/hoogle.nix
deleted file mode 100644
index 568f3d9b292d6620756ff6fd1bf9fb7c1d1f9a3d..0000000000000000000000000000000000000000
--- a/pkgs/hoogle.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, binary, blaze-html
-, blaze-markup, bytestring, cmdargs, conduit, conduit-extra
-, connection, containers, deepseq, directory, extra, filepath
-, foundation, hashable, haskell-src-exts, http-conduit, http-types
-, js-flot, js-jquery, lib, mmap, old-locale, process-extras
-, resourcet, storable-tuple, tar, template-haskell, text, time
-, transformers, uniplate, utf8-string, vector, wai, wai-logger
-, warp, warp-tls, zlib
-}:
-mkDerivation {
-  pname = "hoogle";
-  version = "5.0.18.3";
-  sha256 = "760df4644a8ed0c29c5aae572a5a3fe7e7e4ae65911975d6c33759057839d36c";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    aeson base binary blaze-html blaze-markup bytestring cmdargs
-    conduit conduit-extra connection containers deepseq directory extra
-    filepath foundation hashable haskell-src-exts http-conduit
-    http-types js-flot js-jquery mmap old-locale process-extras
-    QuickCheck resourcet storable-tuple tar template-haskell text time
-    transformers uniplate utf8-string vector wai wai-logger warp
-    warp-tls zlib
-  ];
-  executableHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  testTarget = "--test-option=--no-net";
-  hyperlinkSource = false;
-  homepage = "https://hoogle.haskell.org/";
-  description = "Haskell API Search";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hopenssl.nix b/pkgs/hopenssl.nix
deleted file mode 100644
index 8035315a5a49aedf222ae079615f3c3c4dea6856..0000000000000000000000000000000000000000
--- a/pkgs/hopenssl.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, lib, openssl }:
-mkDerivation {
-  pname = "hopenssl";
-  version = "2.2.5";
-  sha256 = "750f9861124b024d3464e05f9527b423f41f24460127a360786d6d441dc103bf";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  librarySystemDepends = [ openssl ];
-  testHaskellDepends = [ base bytestring HUnit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/peti/hopenssl";
-  description = "FFI Bindings to OpenSSL's EVP Digest Interface";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/horizon-gen-nix.nix b/pkgs/horizon-gen-nix.nix
deleted file mode 100644
index aeec3918779d6287eb8349d3d4d80372f5b7b4b7..0000000000000000000000000000000000000000
--- a/pkgs/horizon-gen-nix.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, Cabal-syntax, base, cabal2nix, containers, dhall
-, directory, distribution-nixpkgs, either, fetchzip, horizon-spec
-, language-nix, lens, lib, optparse-applicative, path
-, path-dhall-instance, pretty, raw-strings-qq, silently, sydtest
-, text
-}:
-mkDerivation {
-  pname = "horizon-gen-nix";
-  version = "0.9.0";
-  src = fetchzip {
-    url = "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix/-/archive/0.9.0/horizon-gen-nix-0.9.0.tar.gz";
-    sha256 = "0jmrpkn56kykisj7zki4ib1zhm6m4qxbzhgz9k4lmf0gh4w37iln";
-  };
-  postUnpack = "sourceRoot+=/horizon-gen-nix/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base Cabal-syntax cabal2nix containers dhall directory
-    distribution-nixpkgs either horizon-spec language-nix lens
-    optparse-applicative path path-dhall-instance pretty raw-strings-qq
-    silently text
-  ];
-  executableHaskellDepends = [ base directory path sydtest ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Generate nix expressions from horizon-spec definitions";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/horizon-spec-lens.nix b/pkgs/horizon-spec-lens.nix
deleted file mode 100644
index 5562fa86a34707a7ab691b421ab36755f33c7dcd..0000000000000000000000000000000000000000
--- a/pkgs/horizon-spec-lens.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, fetchzip, horizon-spec, lens, lib }:
-mkDerivation {
-  pname = "horizon-spec-lens";
-  version = "0.2.1";
-  src = fetchzip {
-    url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec-lens/-/archive/0.2.1/horizon-spec-lens-0.2.1.tar.gz";
-    sha256 = "0b2y8isijbfnf8q62mp2lpc287bv5xnkm389k3bi4yd8kyj44w1n";
-  };
-  postUnpack = "sourceRoot+=/horizon-spec-lens/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base horizon-spec lens ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://horizon-haskell.net";
-  description = "Horizon Stable Package Set Lenses";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/horizon-spec-pretty.nix b/pkgs/horizon-spec-pretty.nix
deleted file mode 100644
index b1498ba02119d7ab87416ccde8813cfceebe08e6..0000000000000000000000000000000000000000
--- a/pkgs/horizon-spec-pretty.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, bytestring, containers, dhall, fetchzip
-, horizon-spec, lib, path, text
-}:
-mkDerivation {
-  pname = "horizon-spec-pretty";
-  version = "0.1.0";
-  src = fetchzip {
-    url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec-pretty/-/archive/0.1.1/horizon-spec-pretty-0.1.1.tar.gz";
-    sha256 = "1prv4kykgfv2g319qbr47xs4w8hf4azn7fdykaf0zq5kbwr7j0g4";
-  };
-  postUnpack = "sourceRoot+=/horizon-spec-pretty/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers dhall horizon-spec path text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://horizon-haskell.net";
-  description = "Horizon Stable Package Set Pretty Printer";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/horizon-spec.nix b/pkgs/horizon-spec.nix
deleted file mode 100644
index 54745ae755f4af5e5de7801ab0b76493e3e594ed..0000000000000000000000000000000000000000
--- a/pkgs/horizon-spec.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, containers, dhall, fetchzip, lib, path
-, path-dhall-instance, template-haskell, text, th-lift
-}:
-mkDerivation {
-  pname = "horizon-spec";
-  version = "0.11.0";
-  src = fetchzip {
-    url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec/-/archive/0.11.0/horizon-spec-0.11.0.tar.gz";
-    sha256 = "0jhpivaafwg9a75qj0aq1lirhvhx4404l8bdsx794sbjqifnwnxn";
-  };
-  postUnpack = "sourceRoot+=/horizon-spec/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers dhall path path-dhall-instance template-haskell
-    text th-lift
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://horizon-haskell.net";
-  description = "Horizon Stable Package Set Type Definitions";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hostname.nix b/pkgs/hostname.nix
deleted file mode 100644
index d141ca30c29d3d558427c3162ac9e08248c2fa99..0000000000000000000000000000000000000000
--- a/pkgs/hostname.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "hostname";
-  version = "1.0";
-  sha256 = "9b43dab1b6da521f35685b20555da00738c8e136eb972458c786242406a9cf5c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A very simple package providing a cross-platform means of determining the hostname";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hourglass.nix b/pkgs/hourglass.nix
deleted file mode 100644
index b7c376a6bb22e88aea6f49c4189e59e97d1d8ad3..0000000000000000000000000000000000000000
--- a/pkgs/hourglass.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, bytestring, deepseq, gauge, lib, mtl
-, old-locale, tasty, tasty-hunit, tasty-quickcheck, time
-}:
-mkDerivation {
-  pname = "hourglass";
-  version = "0.2.12";
-  sha256 = "44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  testHaskellDepends = [
-    base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring deepseq gauge mtl old-locale time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/vincenthz/hs-hourglass";
-  description = "simple performant time related library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hpack.nix b/pkgs/hpack.nix
deleted file mode 100644
index 34e7710dfd7e5444141881eba6435e3f34b9f6d4..0000000000000000000000000000000000000000
--- a/pkgs/hpack.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ mkDerivation, Cabal, Glob, HUnit, QuickCheck, aeson, base
-, bifunctors, bytestring, containers, cryptonite, deepseq
-, directory, filepath, hspec, hspec-discover, http-client
-, http-client-tls, http-types, infer-license, interpolate, lib
-, mockery, pretty, scientific, template-haskell, temporary, text
-, transformers, unordered-containers, vector, yaml
-}:
-mkDerivation {
-  pname = "hpack";
-  version = "0.35.2";
-  sha256 = "03b7013d18dc2280fe3d134d80a68fa95125c456e660b52ae5a873b7662b90ec";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bifunctors bytestring Cabal containers cryptonite
-    deepseq directory filepath Glob http-client http-client-tls
-    http-types infer-license pretty scientific text transformers
-    unordered-containers vector yaml
-  ];
-  executableHaskellDepends = [
-    aeson base bifunctors bytestring Cabal containers cryptonite
-    deepseq directory filepath Glob http-client http-client-tls
-    http-types infer-license pretty scientific text transformers
-    unordered-containers vector yaml
-  ];
-  testHaskellDepends = [
-    aeson base bifunctors bytestring Cabal containers cryptonite
-    deepseq directory filepath Glob hspec http-client http-client-tls
-    http-types HUnit infer-license interpolate mockery pretty
-    QuickCheck scientific template-haskell temporary text transformers
-    unordered-containers vector yaml
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sol/hpack#readme";
-  description = "A modern format for Haskell packages";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hscolour.nix b/pkgs/hscolour.nix
deleted file mode 100644
index a9a308d1b88f5233a630e0fcbb9c4aaeacf692f6..0000000000000000000000000000000000000000
--- a/pkgs/hscolour.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, containers, lib }:
-mkDerivation {
-  pname = "hscolour";
-  version = "1.24.4";
-  sha256 = "243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base containers ];
-  executableHaskellDepends = [ base containers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://code.haskell.org/~malcolm/hscolour/";
-  description = "Colourise Haskell code";
-  license = "LGPL";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hslogger.nix b/pkgs/hslogger.nix
index c71828f20e6271d279d274167fa9e8536d359aad..3003e55ed5c34c18257f15f473afca57cbbe5e56 100644
--- a/pkgs/hslogger.nix
+++ b/pkgs/hslogger.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "hslogger";
   version = "1.3.1.0";
   sha256 = "7f2364f6c0b9c5b85a257267a335816126ef2471c817a42797a5d3c57acaca5b";
-  revision = "7";
-  editedCabalFile = "1jvh7zs0a2n47785bpq9bf3nba0gvbbvhhq1ban87prlhr0j3r2k";
+  revision = "9";
+  editedCabalFile = "1isrz8a09n88fww66qdrq76xlglai8sq14jk2ibv79g045qapj1g";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hspec-api.nix b/pkgs/hspec-api.nix
deleted file mode 100644
index e4d854464a244a1ce28c4135334aeeb6fb78d8e8..0000000000000000000000000000000000000000
--- a/pkgs/hspec-api.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, hspec, hspec-core, hspec-discover, lib
-, transformers
-}:
-mkDerivation {
-  pname = "hspec-api";
-  version = "2.11.0.1";
-  sha256 = "73dee11753e8dda9b5ba342569a510234b5475fa17d9c59266a5739cec142d7f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hspec-core transformers ];
-  testHaskellDepends = [ base hspec hspec-core transformers ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hspec.github.io/";
-  description = "A Testing Framework for Haskell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-core.nix b/pkgs/hspec-core.nix
deleted file mode 100644
index 9b899c88f977e5544226b0759493da2ab5891f0c..0000000000000000000000000000000000000000
--- a/pkgs/hspec-core.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, ansi-terminal, array, base
-, base-orphans, call-stack, deepseq, directory, filepath
-, haskell-lexer, hspec-expectations, hspec-meta, lib, process
-, quickcheck-io, random, setenv, silently, stm, temporary
-, tf-random, time, transformers
-}:
-mkDerivation {
-  pname = "hspec-core";
-  version = "2.10.10";
-  sha256 = "644793717f2f9ee7f778e2f801ea54705bdd0abb71d7a7e40aa75bd98b8f55b6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal array base call-stack deepseq directory filepath
-    haskell-lexer hspec-expectations HUnit process QuickCheck
-    quickcheck-io random setenv stm tf-random time transformers
-  ];
-  testHaskellDepends = [
-    ansi-terminal array base base-orphans call-stack deepseq directory
-    filepath haskell-lexer hspec-expectations hspec-meta HUnit process
-    QuickCheck quickcheck-io random setenv silently stm temporary
-    tf-random time transformers
-  ];
-  testToolDepends = [ hspec-meta ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-  homepage = "https://hspec.github.io/";
-  description = "A Testing Framework for Haskell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-discover.nix b/pkgs/hspec-discover.nix
deleted file mode 100644
index 60120a25efeaf20e05f1ea9d61f5916d88890dab..0000000000000000000000000000000000000000
--- a/pkgs/hspec-discover.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, base, directory, filepath, hspec-meta
-, lib, mockery
-}:
-mkDerivation {
-  pname = "hspec-discover";
-  version = "2.10.10";
-  sha256 = "a809388c0ea90b215e582f11e19e030aefa279d63f6ba1c5cbfd714403152f32";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base directory filepath ];
-  executableHaskellDepends = [ base directory filepath ];
-  testHaskellDepends = [
-    base directory filepath hspec-meta mockery QuickCheck
-  ];
-  testToolDepends = [ hspec-meta ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hspec.github.io/";
-  description = "Automatically discover and run Hspec tests";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-expectations.nix b/pkgs/hspec-expectations.nix
deleted file mode 100644
index 7cd9023183efd858baa72846581e75bc3b764f4c..0000000000000000000000000000000000000000
--- a/pkgs/hspec-expectations.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HUnit, base, call-stack, lib, nanospec }:
-mkDerivation {
-  pname = "hspec-expectations";
-  version = "0.8.2";
-  sha256 = "819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base call-stack HUnit ];
-  testHaskellDepends = [ base call-stack HUnit nanospec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/hspec-expectations#readme";
-  description = "Catchy combinators for HUnit";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-golden.nix b/pkgs/hspec-golden.nix
index 896840fad6dc43ee010dcee8ad0ccce4837dd55a..d30c5c6bd9e35b9873b146ec380374472c98c95d 100644
--- a/pkgs/hspec-golden.nix
+++ b/pkgs/hspec-golden.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "hspec-golden";
-  version = "0.2.0.1";
-  sha256 = "bc64db188b166235d92a3d42efc6c29a41535fda41830cbb03b7e5b9d75d8725";
+  version = "0.2.1.0";
+  sha256 = "7e0cfe0c0427ada2f1947289641c59e5f66e50fc9e743ef52fb41c0b82e46e1d";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hspec-hedgehog.nix b/pkgs/hspec-hedgehog.nix
index 600fb051591e869847a737d948c724e2d6adb2e2..7eba67876348b880f9c382bbbd4e399bab8c2d86 100644
--- a/pkgs/hspec-hedgehog.nix
+++ b/pkgs/hspec-hedgehog.nix
@@ -1,17 +1,15 @@
-{ mkDerivation, HUnit, QuickCheck, base, hedgehog, hspec
-, hspec-core, lib, splitmix
+{ mkDerivation, QuickCheck, base, hedgehog, hspec, hspec-core, lib
+, splitmix
 }:
 mkDerivation {
   pname = "hspec-hedgehog";
-  version = "0.0.1.2";
-  sha256 = "23582ee0f9807b2e49de5da4ae8ef83cb56db63a045a7db73d537eab35c9eb9d";
-  revision = "1";
-  editedCabalFile = "1qv2gap0775d2zg8wbd3kq4ypziz05qlz5jfisvl3jfd6jzcf2ad";
+  version = "0.1.1.0";
+  sha256 = "e6275bf607e3a132cf2ca3e1fd5f2c15c27741b02c138553cdddfee2cddb33c2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base hedgehog hspec hspec-core HUnit QuickCheck splitmix
+    base hedgehog hspec hspec-core QuickCheck splitmix
   ];
   testHaskellDepends = [ base hedgehog hspec ];
   enableLibraryProfiling = true;
diff --git a/pkgs/hspec-megaparsec.nix b/pkgs/hspec-megaparsec.nix
index 273bcf75a23c69ccfb5812f0d8148d0e06ccecef..f937830ff95239bb9b07ddc11bba007974a03270 100644
--- a/pkgs/hspec-megaparsec.nix
+++ b/pkgs/hspec-megaparsec.nix
@@ -1,17 +1,13 @@
-{ mkDerivation, base, containers, hspec, hspec-expectations, lib
-, megaparsec
-}:
+{ mkDerivation, base, hspec, hspec-expectations, lib, megaparsec }:
 mkDerivation {
   pname = "hspec-megaparsec";
-  version = "2.2.0";
-  sha256 = "f609b4bb7e38ecba0503f1fc349a2600f5c799ef3c33731ad6a6e1ff9f01ce43";
+  version = "2.2.1";
+  sha256 = "65f4f57f96c05fce5f55e8ad6aafcf4f2e5726d95d74855a95d6779927936a2d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers hspec-expectations megaparsec
-  ];
-  testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+  libraryHaskellDepends = [ base hspec-expectations megaparsec ];
+  testHaskellDepends = [ base hspec megaparsec ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/hspec-meta.nix b/pkgs/hspec-meta.nix
deleted file mode 100644
index 406afb4994c95dd107a6ddef6aa8086351de90da..0000000000000000000000000000000000000000
--- a/pkgs/hspec-meta.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, ansi-terminal, array, base, call-stack
-, clock, deepseq, directory, filepath, ghc, ghc-boot-th, lib
-, quickcheck-io, random, setenv, stm, time, transformers
-}:
-mkDerivation {
-  pname = "hspec-meta";
-  version = "2.10.5";
-  sha256 = "76699dd9c668b0cf49371aea1cfe97d69edd411724efd776fadb8ebbeb7eea49";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal array base call-stack clock deepseq directory
-    filepath ghc ghc-boot-th QuickCheck quickcheck-io random setenv stm
-    time transformers
-  ];
-  executableHaskellDepends = [
-    ansi-terminal array base call-stack clock deepseq directory
-    filepath ghc ghc-boot-th QuickCheck quickcheck-io random setenv
-    time transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://hspec.github.io/";
-  description = "A version of Hspec which is used to test Hspec itself";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec-smallcheck.nix b/pkgs/hspec-smallcheck.nix
deleted file mode 100644
index 8c966b009eab5b4294fbbc0995bacaff120f7684..0000000000000000000000000000000000000000
--- a/pkgs/hspec-smallcheck.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, base-orphans, call-stack
-, hspec, hspec-core, hspec-discover, lib, smallcheck
-}:
-mkDerivation {
-  pname = "hspec-smallcheck";
-  version = "0.5.3";
-  sha256 = "f5810a4be4878fd3e02efc9895a2534f5783387c98aae0d9787f50da2eac5032";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base call-stack hspec-core HUnit smallcheck
-  ];
-  testHaskellDepends = [
-    base base-orphans call-stack hspec hspec-core HUnit QuickCheck
-    smallcheck
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://hspec.github.io/";
-  description = "SmallCheck support for the Hspec testing framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hspec.nix b/pkgs/hspec.nix
deleted file mode 100644
index 788f62dee2d95473f04ad443bbedb4c430828150..0000000000000000000000000000000000000000
--- a/pkgs/hspec.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, QuickCheck, base, hspec-core, hspec-discover
-, hspec-expectations, lib
-}:
-mkDerivation {
-  pname = "hspec";
-  version = "2.10.10";
-  sha256 = "9a4b5e63d51796d5f6c3590b8495a1cd8c600e1bf720086b6709ee00405d03a4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base hspec-core hspec-discover hspec-expectations QuickCheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hspec.github.io/";
-  description = "A Testing Framework for Haskell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/html-entity-map.nix b/pkgs/html-entity-map.nix
index b59e603ae38d0ae06a4ccb441a632bf700d71861..429854b0e7ff656e77fa74b45f4935d1e505ce1f 100644
--- a/pkgs/html-entity-map.nix
+++ b/pkgs/html-entity-map.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "html-entity-map";
   version = "0.1.0.0";
   sha256 = "983600c33e8515e6ca31742d25490fb5a7be02503331963621b0ba5cd70d344c";
-  revision = "5";
-  editedCabalFile = "1776z73bs1v8z3qwpjvqqmzdlj6gm8qba93f41irhn7swdppfq72";
+  revision = "6";
+  editedCabalFile = "0xlzcz5mxp5l6dz2ajraylxkgdbj5yflxh3fr019d3fqvr2a2hwz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/http-api-data.nix b/pkgs/http-api-data.nix
index 315360f510c1b0a2643404451a8e8ef091dea76e..cb41e7acf18070e13283ef12a983a52cbc520a42 100644
--- a/pkgs/http-api-data.nix
+++ b/pkgs/http-api-data.nix
@@ -1,25 +1,25 @@
-{ mkDerivation, HUnit, QuickCheck, attoparsec, attoparsec-iso8601
-, base, base-compat, bytestring, containers, cookie, hashable
-, hspec, hspec-discover, http-types, lib, quickcheck-instances
-, tagged, text, time-compat, transformers, unordered-containers
-, uuid-types
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, containers
+, cookie, hashable, hspec, hspec-discover, http-types, lib
+, quickcheck-instances, tagged, text, text-iso8601, time-compat
+, transformers, unordered-containers, uuid-types
 }:
 mkDerivation {
   pname = "http-api-data";
-  version = "0.5.1";
-  sha256 = "6166c64824e139a2727cc31af44d0077f66eb3921a20973bc6e98ff9fb77122b";
+  version = "0.6";
+  sha256 = "74904382dfd0774a34fef881d895afafdb856bd57f162db275cfe550a1dc1346";
+  revision = "1";
+  editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec attoparsec-iso8601 base base-compat bytestring
-    containers cookie hashable http-types tagged text time-compat
-    transformers unordered-containers uuid-types
+    base bytestring containers cookie hashable http-types tagged text
+    text-iso8601 time-compat transformers unordered-containers
+    uuid-types
   ];
   testHaskellDepends = [
-    base base-compat bytestring cookie hspec HUnit QuickCheck
-    quickcheck-instances text time-compat unordered-containers
-    uuid-types
+    base bytestring cookie hspec HUnit QuickCheck quickcheck-instances
+    text time-compat unordered-containers uuid-types
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
diff --git a/pkgs/http-client-tls.nix b/pkgs/http-client-tls.nix
deleted file mode 100644
index 459f5d4e3e88e38eb3c11723d9f56f05e6c153e6..0000000000000000000000000000000000000000
--- a/pkgs/http-client-tls.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, base, bytestring, case-insensitive, connection
-, containers, cryptonite, data-default-class, exceptions, gauge
-, hspec, http-client, http-types, lib, memory, network, network-uri
-, text, tls, transformers
-}:
-mkDerivation {
-  pname = "http-client-tls";
-  version = "0.3.6.1";
-  sha256 = "b19fff86a41b6035cbd97271a5d6965e43dcc4bedbe4c03dd586fed65fbac80d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring case-insensitive connection containers cryptonite
-    data-default-class exceptions http-client http-types memory network
-    network-uri text tls transformers
-  ];
-  testHaskellDepends = [
-    base connection hspec http-client http-types
-  ];
-  benchmarkHaskellDepends = [ base gauge http-client ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/http-client";
-  description = "http-client backend using the connection package and tls library";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-client.nix b/pkgs/http-client.nix
deleted file mode 100644
index 38e1b65b4f2517e094d76e302a72f23f70c3511c..0000000000000000000000000000000000000000
--- a/pkgs/http-client.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, array, async, base, base64-bytestring
-, blaze-builder, bytestring, case-insensitive, containers, cookie
-, deepseq, directory, exceptions, filepath, ghc-prim, hspec
-, hspec-discover, http-types, iproute, lib, mime-types
-, monad-control, network, network-uri, random, stm
-, streaming-commons, text, time, transformers, zlib
-}:
-mkDerivation {
-  pname = "http-client";
-  version = "0.7.13.1";
-  sha256 = "c98e86a0382fa877e320d83dbbd173c41c966a60a32c9bc597058929a7aa0e27";
-  revision = "1";
-  editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array async base base64-bytestring blaze-builder bytestring
-    case-insensitive containers cookie deepseq exceptions filepath
-    ghc-prim http-types iproute mime-types network network-uri random
-    stm streaming-commons text time transformers
-  ];
-  testHaskellDepends = [
-    async base blaze-builder bytestring case-insensitive containers
-    cookie deepseq directory hspec http-types monad-control network
-    network-uri streaming-commons text time transformers zlib
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/http-client";
-  description = "An HTTP client engine";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-conduit.nix b/pkgs/http-conduit.nix
deleted file mode 100644
index 101f48d4594869ac2b9da447c99f95693081fb95..0000000000000000000000000000000000000000
--- a/pkgs/http-conduit.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, HUnit, aeson, attoparsec, base, blaze-builder
-, bytestring, case-insensitive, conduit, conduit-extra, connection
-, cookie, data-default-class, hspec, http-client, http-client-tls
-, http-types, lib, mtl, network, resourcet, streaming-commons
-, temporary, text, time, tls, transformers, unliftio, unliftio-core
-, utf8-string, wai, wai-conduit, warp, warp-tls
-}:
-mkDerivation {
-  pname = "http-conduit";
-  version = "2.3.8";
-  sha256 = "cfbef293856fdcce58618726ff911ca28e2ad07c8522b2cd1cfa2cb6e02542ae";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base bytestring conduit conduit-extra http-client
-    http-client-tls http-types mtl resourcet transformers unliftio-core
-  ];
-  testHaskellDepends = [
-    aeson base blaze-builder bytestring case-insensitive conduit
-    conduit-extra connection cookie data-default-class hspec
-    http-client http-types HUnit network resourcet streaming-commons
-    temporary text time tls transformers unliftio utf8-string wai
-    wai-conduit warp warp-tls
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/http-conduit";
-  description = "HTTP client package with conduit interface and HTTPS support";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-date.nix b/pkgs/http-date.nix
deleted file mode 100644
index 04bab89e4acb3c0ff0b3cfdcf0f87aa0cd2f111e..0000000000000000000000000000000000000000
--- a/pkgs/http-date.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, array, attoparsec, base, bytestring, doctest, hspec
-, lib, old-locale, time
-}:
-mkDerivation {
-  pname = "http-date";
-  version = "0.0.11";
-  sha256 = "32f923ac1ad9bdfeadce7c52a03c9ba6225ba60dc14137cb1cdf32ea84ccf4d3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array attoparsec base bytestring time ];
-  testHaskellDepends = [
-    base bytestring doctest hspec old-locale time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "HTTP Date parser/formatter";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http-media.nix b/pkgs/http-media.nix
index a718e05c798f9764997e53e740cd97a02072d43e..fe4ce9abd47969101f58d172090ff1de61cede3c 100644
--- a/pkgs/http-media.nix
+++ b/pkgs/http-media.nix
@@ -1,13 +1,12 @@
 { mkDerivation, QuickCheck, base, bytestring, case-insensitive
-, containers, lib, test-framework, test-framework-quickcheck2
-, utf8-string
+, containers, lib, tasty, tasty-quickcheck, utf8-string
 }:
 mkDerivation {
   pname = "http-media";
-  version = "0.8.0.0";
-  sha256 = "398279d1dff5b60cd8b8c650caceca248ea1184d694bedf5df5426963b2b9c53";
-  revision = "8";
-  editedCabalFile = "08r5iq0hi1y4y1b6vdi4kp52blvxzmd9gxa38xwzz86xnz84xvzl";
+  version = "0.8.1.1";
+  sha256 = "1920adf31b15d167f60374fbfd0a53a1fbe7820fd7fd459beacf6eb00d03f183";
+  revision = "1";
+  editedCabalFile = "0vlaxmh1qqli981bwn3hw0hqfy6spkijdywycnhxi0z1qg5837fk";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,8 +14,8 @@ mkDerivation {
     base bytestring case-insensitive containers utf8-string
   ];
   testHaskellDepends = [
-    base bytestring case-insensitive containers QuickCheck
-    test-framework test-framework-quickcheck2 utf8-string
+    base bytestring case-insensitive containers QuickCheck tasty
+    tasty-quickcheck utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/http-streams.nix b/pkgs/http-streams.nix
index 1c67a05f1453995b7a3f85c7720136d402905ddd..414c60b61cd5115e769738a5eaa32c651f442d68 100644
--- a/pkgs/http-streams.nix
+++ b/pkgs/http-streams.nix
@@ -1,22 +1,22 @@
 { mkDerivation, HUnit, HsOpenSSL, aeson, aeson-pretty, attoparsec
-, base, base64-bytestring, blaze-builder, bytestring
-, case-insensitive, directory, filepath, ghc-prim, hspec
-, hspec-expectations, http-common, io-streams, lib, lifted-base
-, mtl, network, network-uri, openssl-streams, random, snap-core
-, snap-server, text, transformers, unordered-containers
+, attoparsec-aeson, base, base64-bytestring, blaze-builder
+, bytestring, case-insensitive, directory, filepath, ghc-prim
+, hspec, hspec-expectations, http-common, io-streams, lib
+, lifted-base, mtl, network, network-uri, openssl-streams, random
+, snap-core, snap-server, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "http-streams";
-  version = "0.8.9.6";
-  sha256 = "bad3c6d94dc44e87d4d7e98467631d2d6f369120bbbb917935fb59e2c3b516c1";
+  version = "0.8.9.9";
+  sha256 = "1bf34ab439eb5d2bdf540e8d77ced5ea8baa2ee2ca6048e7ba651db8405e6afb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson attoparsec base base64-bytestring blaze-builder bytestring
-    case-insensitive directory filepath HsOpenSSL http-common
-    io-streams mtl network network-uri openssl-streams text
-    transformers unordered-containers
+    aeson attoparsec attoparsec-aeson base base64-bytestring
+    blaze-builder bytestring case-insensitive directory filepath
+    HsOpenSSL http-common io-streams mtl network network-uri
+    openssl-streams text transformers unordered-containers
   ];
   testHaskellDepends = [
     aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
diff --git a/pkgs/http-types.nix b/pkgs/http-types.nix
deleted file mode 100644
index f18322840bb64bf7a7c59d209b35c4cce4cdf949..0000000000000000000000000000000000000000
--- a/pkgs/http-types.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, bytestring
-, case-insensitive, doctest, hspec, lib, quickcheck-instances, text
-}:
-mkDerivation {
-  pname = "http-types";
-  version = "0.12.3";
-  sha256 = "4e8a4a66477459fa436a331c75e46857ec8026283df984d54f90576cd3024016";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring case-insensitive text
-  ];
-  testHaskellDepends = [
-    base bytestring doctest hspec QuickCheck quickcheck-instances text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/aristidb/http-types";
-  description = "Generic HTTP types for Haskell (for both client and server code)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/http2.nix b/pkgs/http2.nix
deleted file mode 100644
index fa5f80a0018f55c20f21bf6922359e6a38f588ad..0000000000000000000000000000000000000000
--- a/pkgs/http2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ mkDerivation, Glob, aeson, aeson-pretty, array, async, base
-, base16-bytestring, bytestring, case-insensitive, containers
-, cryptonite, directory, filepath, gauge, hspec, hspec-discover
-, http-types, lib, network, network-byte-order, network-run
-, psqueues, stm, text, time-manager, typed-process, unix-time
-, unliftio, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "http2";
-  version = "4.1.2";
-  sha256 = "15fc296032c0965fd3d1c5d3b421ba548265878e9fcfeb45e279718d31b09c60";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array async base bytestring case-insensitive containers http-types
-    network network-byte-order psqueues stm time-manager unix-time
-    unliftio
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty async base base16-bytestring bytestring
-    cryptonite directory filepath Glob hspec http-types network
-    network-byte-order network-run text typed-process
-    unordered-containers vector
-  ];
-  testToolDepends = [ hspec-discover ];
-  benchmarkHaskellDepends = [
-    array base bytestring case-insensitive containers gauge
-    network-byte-order stm
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/kazu-yamamoto/http2";
-  description = "HTTP/2 library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/httpd-shed.nix b/pkgs/httpd-shed.nix
deleted file mode 100644
index 09806042925bbaba8a219927d23fdf4ff9542470..0000000000000000000000000000000000000000
--- a/pkgs/httpd-shed.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib, network, network-bsd, network-uri }:
-mkDerivation {
-  pname = "httpd-shed";
-  version = "0.4.1.1";
-  sha256 = "590fcfcb401923652bfcaf8c9a81b3bbbe83a4b1d16f7ccfecf7e47f6b6cafa5";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base network network-bsd network-uri ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A simple web-server with an interact style API";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/hw-hspec-hedgehog.nix b/pkgs/hw-hspec-hedgehog.nix
index f1a50f0e2fe5eeceae9e4b84789512a7e9a64b0d..f47c220e177a5796bb132612d7fde159e28226a4 100644
--- a/pkgs/hw-hspec-hedgehog.nix
+++ b/pkgs/hw-hspec-hedgehog.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "hw-hspec-hedgehog";
   version = "0.1.1.1";
   sha256 = "fa4c101574484cc8f9775fefc558f62e86c0d0c7e4b494b4adfb6d897ac68fc6";
-  revision = "3";
-  editedCabalFile = "129bnprzh8nglbi5x8i5dlc4v5qr7cqg6bajy6id1168r26ciwcq";
+  revision = "4";
+  editedCabalFile = "0fwdbd7m7b9743y6w1ci3m7m0bgw7w0r0h7pvn2xrhvyjvp9rjqh";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/hw-prim.nix b/pkgs/hw-prim.nix
index 63a021659abc32f67b6040ebe2188b2579e9ea5a..65e773971dc87e1b53f4b85e0e64c2a3373385da 100644
--- a/pkgs/hw-prim.nix
+++ b/pkgs/hw-prim.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "hw-prim";
   version = "0.6.3.2";
   sha256 = "1fa05fdc46c72ed4b28aabcee69695ce810d451bbd263fbe75f94b179e20441d";
+  revision = "1";
+  editedCabalFile = "1wga8ghc001lz9y76ffrdrpqkxpj1lz7qpkykfl66lsqf5pvng32";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/ieee754.nix b/pkgs/ieee754.nix
deleted file mode 100644
index de9cdc0fe408ff658270a7347e72caefa719daa7..0000000000000000000000000000000000000000
--- a/pkgs/ieee754.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "ieee754";
-  version = "0.8.0";
-  sha256 = "0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/patperry/hs-ieee754";
-  description = "Utilities for dealing with IEEE floating point numbers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/indexed-profunctors.nix b/pkgs/indexed-profunctors.nix
index 81663a5a4e489d7296d3ff7b2b89012d46834793..be09ecb21abc946dbd8e25e6993aab3751dce543 100644
--- a/pkgs/indexed-profunctors.nix
+++ b/pkgs/indexed-profunctors.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "indexed-profunctors";
-  version = "0.1.1";
-  sha256 = "5aba418a92a4f75efc626de7c0e4d88ed57033e0de0f2743ce6d9c9ef7626cb1";
+  version = "0.1.1.1";
+  sha256 = "2e69bb2900bb7e562efffff7bcf3f72daf79f013232ce603263a57595412c398";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/indexed-traversable-instances.nix b/pkgs/indexed-traversable-instances.nix
deleted file mode 100644
index 20d8ec79b7a7c4c69d874337ee4e01aec761ad8f..0000000000000000000000000000000000000000
--- a/pkgs/indexed-traversable-instances.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, OneTuple, QuickCheck, base, containers
-, indexed-traversable, lib, quickcheck-instances, tagged, tasty
-, tasty-quickcheck, transformers, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "indexed-traversable-instances";
-  version = "0.1.1.2";
-  sha256 = "0f9b4e895ccc819f74d15f913c93613cc74cab74dbb05d7e305aa387bdbe374a";
-  revision = "1";
-  editedCabalFile = "1vyfs8xwxm2ipgiinzrp41pl0cy2xrmx7a9iim4vlz1sca1yv4xl";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base indexed-traversable OneTuple tagged unordered-containers
-    vector
-  ];
-  testHaskellDepends = [
-    base containers indexed-traversable OneTuple QuickCheck
-    quickcheck-instances tasty tasty-quickcheck transformers
-    unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/indexed-traversable.nix b/pkgs/indexed-traversable.nix
deleted file mode 100644
index 55048b250967bf58e37bbf36589f3a473ccdf668..0000000000000000000000000000000000000000
--- a/pkgs/indexed-traversable.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, array, base, containers, lib, transformers }:
-mkDerivation {
-  pname = "indexed-traversable";
-  version = "0.1.2.1";
-  sha256 = "fe854c10285debc7d6fe3e09da0928a740ebc091ad2911ae695bb007e6f746a4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base containers transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/infer-license.nix b/pkgs/infer-license.nix
deleted file mode 100644
index aadf2c5b11765cfae7e515f0395d0c730b366314..0000000000000000000000000000000000000000
--- a/pkgs/infer-license.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, directory, filepath, hspec, lib, text
-, text-metrics
-}:
-mkDerivation {
-  pname = "infer-license";
-  version = "0.2.0";
-  sha256 = "12e6fe616575159c03cf6fd4a4f30021ecf264a529ab4e4edd6e96e296a98e72";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base directory filepath text text-metrics
-  ];
-  testHaskellDepends = [
-    base directory filepath hspec text text-metrics
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Infer software license from a given license file";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/ini.nix b/pkgs/ini.nix
deleted file mode 100644
index 16fc04f4f540ab7ef5cd029fc7a0405a2a2eb382..0000000000000000000000000000000000000000
--- a/pkgs/ini.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, attoparsec, base, hspec, lib, text
-, unordered-containers
-}:
-mkDerivation {
-  pname = "ini";
-  version = "0.4.2";
-  sha256 = "f79d8ceca14a0d4039e3443d34e9e33a390fd3c3562a8f0a301f45ba1161e936";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base text unordered-containers
-  ];
-  testHaskellDepends = [ base hspec unordered-containers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/andreasabel/ini";
-  description = "Configuration files in the INI format";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/inline-c.nix b/pkgs/inline-c.nix
index d97cfa5fb2cdde75d07dd8594241fcc614fcb07d..112d3a3255aac27efad6cf9b8f6c7a5a2587f5ac 100644
--- a/pkgs/inline-c.nix
+++ b/pkgs/inline-c.nix
@@ -1,21 +1,22 @@
-{ mkDerivation, QuickCheck, ansi-wl-pprint, base, bytestring
-, containers, hashable, hspec, lib, mtl, parsec, parsers
-, raw-strings-qq, regex-posix, split, template-haskell
-, transformers, unordered-containers, vector
+{ mkDerivation, QuickCheck, base, bytestring, containers, hashable
+, hspec, lib, mtl, parsec, parsers, prettyprinter, raw-strings-qq
+, regex-posix, split, template-haskell, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "inline-c";
-  version = "0.9.1.7";
-  sha256 = "53276d02f4940b55da2fe485180bee3ead289f5ab78d70ff4e51334c5e769c71";
+  version = "0.9.1.10";
+  sha256 = "6d0d2e8e49f27925713d7d4550c2e901418b7dfbd6b288e0d3a8fd47165ea4b1";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint base bytestring containers hashable mtl parsec
-    parsers template-haskell transformers unordered-containers vector
+    base bytestring containers hashable mtl parsec parsers
+    prettyprinter template-haskell transformers unordered-containers
+    vector
   ];
   testHaskellDepends = [
-    ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+    base containers hashable hspec parsers prettyprinter QuickCheck
     raw-strings-qq regex-posix split template-haskell transformers
     unordered-containers vector
   ];
diff --git a/pkgs/inline-r.nix b/pkgs/inline-r.nix
deleted file mode 100644
index 04f9cffc899e63af722a5910a73eaa86d3398ee2..0000000000000000000000000000000000000000
--- a/pkgs/inline-r.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ mkDerivation
-, R
-, aeson
-, base
-, bytestring
-, containers
-, criterion
-, data-default-class
-, deepseq
-, directory
-, exceptions
-, filepath
-, heredoc
-, ieee754
-, inline-c
-, lib
-, mtl
-, pretty
-, primitive
-, process
-, quickcheck-assertions
-, reflection
-, setenv
-, silently
-, singletons
-, singletons-th
-, strict
-, tasty
-, tasty-expected-failure
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, temporary
-, text
-, th-lift
-, th-orphans
-, transformers
-, unix
-, vector
-}:
-mkDerivation {
-  pname = "inline-r";
-  version = "1.0.0";
-  sha256 = "6ac962e2322049392428af712bc46b7319419a3b00b2749892352d489fd3fd2c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    data-default-class
-    deepseq
-    exceptions
-    heredoc
-    inline-c
-    mtl
-    pretty
-    primitive
-    process
-    reflection
-    setenv
-    singletons
-    singletons-th
-    template-haskell
-    temporary
-    text
-    th-lift
-    th-orphans
-    transformers
-    unix
-    vector
-  ];
-  libraryPkgconfigDepends = [ R ];
-  testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    heredoc
-    ieee754
-    mtl
-    process
-    quickcheck-assertions
-    silently
-    singletons
-    strict
-    tasty
-    tasty-expected-failure
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
-    temporary
-    text
-    unix
-    vector
-  ];
-  benchmarkHaskellDepends = [
-    base
-    criterion
-    filepath
-    primitive
-    process
-    singletons
-    template-haskell
-    vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://tweag.github.io/HaskellR";
-  description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
diff --git a/pkgs/insert-ordered-containers.nix b/pkgs/insert-ordered-containers.nix
index f4d115300960ee66c52e95c7121f67b17e71a990..8f044c63ce12209ac7473ce12bfee097a08f5ce3 100644
--- a/pkgs/insert-ordered-containers.nix
+++ b/pkgs/insert-ordered-containers.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "insert-ordered-containers";
-  version = "0.2.5.2";
-  sha256 = "9a5ef8f7660d336a4f819c3f0dbb7143caff12a21dac76b3bb3d0eacd8c26c79";
+  version = "0.2.5.3";
+  sha256 = "f04f6e59795d8e362d15422a62d7c7c48312c2d97d2bc4372002a8a9b9a2436c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/inspection-testing.nix b/pkgs/inspection-testing.nix
deleted file mode 100644
index fd3bf76c5442ae92a6daa58313680f2e45e102e2..0000000000000000000000000000000000000000
--- a/pkgs/inspection-testing.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, containers, ghc, lib, mtl, template-haskell
-, transformers
-}:
-mkDerivation {
-  pname = "inspection-testing";
-  version = "0.5.0.1";
-  sha256 = "29750b73c578346659c89a146436e2f582fb0f28d1292b8cf0631873278b077f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc mtl template-haskell transformers
-  ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/nomeata/inspection-testing";
-  description = "GHC plugin to do inspection testing";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/int-cast.nix b/pkgs/int-cast.nix
index ccde8fdd28253b351a6a11b02fecfd5526805053..79c08893f5eefae6dcd0c9eba9340dac2cb6a3ce 100644
--- a/pkgs/int-cast.nix
+++ b/pkgs/int-cast.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "int-cast";
   version = "0.2.0.0";
   sha256 = "e006956a08b751a996a92828ccb728b7237c9c435c4b35b5169eb8d44ac51969";
-  revision = "4";
-  editedCabalFile = "1l5n3hsa8gr0wzc3cb32ha2j8kcf976i84z04580q41macf0r0h6";
+  revision = "6";
+  editedCabalFile = "11yvshlvp4ma279h9d4s1sdhlng4abar85crwkjsbjlvhfhlc3xw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -21,7 +21,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/hvr/int-cast";
+  homepage = "https://github.com/haskell-hvr/int-cast";
   description = "Checked conversions between integral types";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/integer-logarithms.nix b/pkgs/integer-logarithms.nix
index e7b0f259288b3430b7b9beca654e1d9893c4b8eb..f5455ecf90e7f535dd6edd3b1287572006aad110 100644
--- a/pkgs/integer-logarithms.nix
+++ b/pkgs/integer-logarithms.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "integer-logarithms";
   version = "1.0.3.1";
   sha256 = "9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f";
-  revision = "4";
-  editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk";
+  revision = "5";
+  editedCabalFile = "03f07vv1xqvv53fiarn4rpj2hzsa9bx7lw883axmgzv49qrzq3ad";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/interpolate.nix b/pkgs/interpolate.nix
deleted file mode 100644
index 5be289d8201575abe0480f7babce6178b278996e..0000000000000000000000000000000000000000
--- a/pkgs/interpolate.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, base, base-compat, bytestring
-, haskell-src-meta, hspec, lib, quickcheck-instances
-, template-haskell, text
-}:
-mkDerivation {
-  pname = "interpolate";
-  version = "0.2.1";
-  sha256 = "2776dd5083aead756a761c3350a87312b4fbf4851555cf9560800bc3929c590e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
-  testHaskellDepends = [
-    base base-compat bytestring haskell-src-meta hspec QuickCheck
-    quickcheck-instances template-haskell text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sol/interpolate#readme";
-  description = "String interpolation done right";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/invariant.nix b/pkgs/invariant.nix
deleted file mode 100644
index 37d1b2aec67a0696b5081197b9f5d8736d9db14d..0000000000000000000000000000000000000000
--- a/pkgs/invariant.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, QuickCheck, StateVar, array, base, bifunctors
-, comonad, containers, contravariant, ghc-prim, hspec
-, hspec-discover, lib, profunctors, stm, tagged, template-haskell
-, th-abstraction, transformers, transformers-compat
-, unordered-containers
-}:
-mkDerivation {
-  pname = "invariant";
-  version = "0.6.1";
-  sha256 = "fb7294ade6554e9c6e77020f065f3acb63f78e62019e4830ea509c36c8b0d4f0";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bifunctors comonad containers contravariant ghc-prim
-    profunctors StateVar stm tagged template-haskell th-abstraction
-    transformers transformers-compat unordered-containers
-  ];
-  testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/nfrisby/invariant-functors";
-  description = "Haskell98 invariant functors";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/io-streams-haproxy.nix b/pkgs/io-streams-haproxy.nix
index d115b9b29bfa06ea4e42b3b55d2370167cf8b61b..735b6292e57540d704c46551e64a969915b770e7 100644
--- a/pkgs/io-streams-haproxy.nix
+++ b/pkgs/io-streams-haproxy.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "io-streams-haproxy";
   version = "1.0.1.0";
   sha256 = "b74eca9290fe838a0e3be857a38b62cf6fb7478acee400eac19e47471a2c96b5";
-  revision = "7";
-  editedCabalFile = "0wib2mz6ifnixrcp9s1pkd00v9q7dvyka1z7zqc3pgif47hr1dbw";
+  revision = "8";
+  editedCabalFile = "03gzlz7hg2jvnx2355r65201680lcm59ln7azzb118abirl460s6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/io-streams.nix b/pkgs/io-streams.nix
index 065bc00f5e7911e0490ec36d4714a429fc929c3e..b7dfd84879530022a8615b806e2a3cd27b035325 100644
--- a/pkgs/io-streams.nix
+++ b/pkgs/io-streams.nix
@@ -8,8 +8,8 @@ mkDerivation {
   pname = "io-streams";
   version = "1.5.2.2";
   sha256 = "d365d5051696c15414ebe23749fc67475a532234b7c7d77060323d149a8fc4fe";
-  revision = "1";
-  editedCabalFile = "1fkjzk7s99sb7h1lvandw9p8r05ly4206y3aiah0jg39zjvbi5az";
+  revision = "3";
+  editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c";
   configureFlags = [ "-fnointeractivetests" ];
   isLibrary = true;
   isExecutable = false;
diff --git a/pkgs/iproute.nix b/pkgs/iproute.nix
deleted file mode 100644
index 83fbb49fe5efe2bf1fabfbfffeff871ab34ed513..0000000000000000000000000000000000000000
--- a/pkgs/iproute.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, appar, base, byteorder, bytestring
-, containers, doctest, hspec, lib, network, safe
-}:
-mkDerivation {
-  pname = "iproute";
-  version = "1.7.12";
-  sha256 = "f1751d1579fcbc1d9f86d9d1c9ede48cb71cbeb1d7b2043491c6216e4f236b63";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    appar base byteorder bytestring containers network
-  ];
-  testHaskellDepends = [
-    appar base byteorder bytestring containers doctest hspec network
-    QuickCheck safe
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.mew.org/~kazu/proj/iproute/";
-  description = "IP Routing Table";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/isomorphism-class.nix b/pkgs/isomorphism-class.nix
index 20e39afb3da640edc220579b862e3421908445e9..92fa34ed323b663fa1076438673f51af17feedd3 100644
--- a/pkgs/isomorphism-class.nix
+++ b/pkgs/isomorphism-class.nix
@@ -1,11 +1,11 @@
 { mkDerivation, QuickCheck, base, bytestring, containers, hashable
-, lib, primitive, quickcheck-instances, rebase, tasty, tasty-hunit
+, lib, primitive, quickcheck-instances, rebase, tasty
 , tasty-quickcheck, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "isomorphism-class";
-  version = "0.1.0.9";
-  sha256 = "2fbaa8cf141489a2107e294e50628dc7797b8e3218069bdfbc387ab9547d1bb4";
+  version = "0.1.0.11";
+  sha256 = "e317c46a01bf4f274a745b5583028a48485aeb80b06f3b6b9394e186df4d37fd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,9 +14,8 @@ mkDerivation {
     unordered-containers vector
   ];
   testHaskellDepends = [
-    base bytestring containers hashable primitive QuickCheck
-    quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text
-    unordered-containers vector
+    bytestring primitive QuickCheck quickcheck-instances rebase tasty
+    tasty-quickcheck text vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/jailbreak-cabal.nix b/pkgs/jailbreak-cabal.nix
deleted file mode 100644
index 6a4aa70b07244640f20a655deec50fb7fd4503dc..0000000000000000000000000000000000000000
--- a/pkgs/jailbreak-cabal.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, Cabal, Cabal-syntax, base, lib }:
-mkDerivation {
-  pname = "jailbreak-cabal";
-  version = "1.4";
-  sha256 = "4c76b5493098b83348f0fd98436cbbe18768da30bcc0ff7dcba0c250c73e9429";
-  isLibrary = false;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  executableHaskellDepends = [ base Cabal Cabal-syntax ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NixOS/jailbreak-cabal";
-  description = "Strip version restrictions from Cabal files";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/jose-jwt.nix b/pkgs/jose-jwt.nix
index b3c23ce9535f7e5c12f6f3c71225d6fc2e6cd69d..1d28702e9fdb17f43bbe2c66c3be399033bbaff8 100644
--- a/pkgs/jose-jwt.nix
+++ b/pkgs/jose-jwt.nix
@@ -22,7 +22,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = true;
+  doHaddock = false;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/jose.nix b/pkgs/jose.nix
index f35542af9104f5a384c5907c1f4da620c7e796fc..792a1810145a47028cc9bebadd239eb7349dfa87 100644
--- a/pkgs/jose.nix
+++ b/pkgs/jose.nix
@@ -1,24 +1,24 @@
 { mkDerivation, aeson, base, base64-bytestring, bytestring, concise
-, containers, cryptonite, hedgehog, hspec, lens, lib, memory
-, monad-time, mtl, network-uri, pem, tasty, tasty-hedgehog
-, tasty-hspec, template-haskell, text, time, x509
+, containers, crypton, crypton-x509, hedgehog, hspec, lens, lib
+, memory, monad-time, mtl, network-uri, pem, tasty, tasty-hedgehog
+, tasty-hspec, template-haskell, text, time
 }:
 mkDerivation {
   pname = "jose";
-  version = "0.10";
-  sha256 = "1f498a69edae67935216db65afc9990075469918670237d4dcc3b0e38d0a1242";
+  version = "0.11";
+  sha256 = "2974e73d899208dccbb18cac889acceaebb7439e43046ac32c9c702e49f70b40";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson base base64-bytestring bytestring concise containers
-    cryptonite lens memory monad-time mtl network-uri template-haskell
-    text time x509
+    aeson base base64-bytestring bytestring concise containers crypton
+    crypton-x509 lens memory monad-time mtl network-uri
+    template-haskell text time
   ];
   testHaskellDepends = [
-    aeson base base64-bytestring bytestring concise containers
-    cryptonite hedgehog hspec lens mtl network-uri pem tasty
-    tasty-hedgehog tasty-hspec text time x509
+    aeson base base64-bytestring bytestring concise containers crypton
+    crypton-x509 hedgehog hspec lens mtl network-uri pem tasty
+    tasty-hedgehog tasty-hspec time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/js-flot.nix b/pkgs/js-flot.nix
deleted file mode 100644
index 78b4f6aaddbd78ad4ae89e2236b833b35759b20e..0000000000000000000000000000000000000000
--- a/pkgs/js-flot.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HTTP, base, lib }:
-mkDerivation {
-  pname = "js-flot";
-  version = "0.8.3";
-  sha256 = "1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base HTTP ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/js-flot#readme";
-  description = "Obtain minified flot code";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/js-jquery.nix b/pkgs/js-jquery.nix
deleted file mode 100644
index d13f722ec47ffb2c282ef1dc31f53859931225b0..0000000000000000000000000000000000000000
--- a/pkgs/js-jquery.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HTTP, base, lib }:
-mkDerivation {
-  pname = "js-jquery";
-  version = "3.3.1";
-  sha256 = "e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base HTTP ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/js-jquery#readme";
-  description = "Obtain minified jQuery code";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/kan-extensions.nix b/pkgs/kan-extensions.nix
deleted file mode 100644
index b8c3024a6f7813e39957c715513610811e2939d9..0000000000000000000000000000000000000000
--- a/pkgs/kan-extensions.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, adjunctions, array, base, comonad, containers
-, contravariant, distributive, free, invariant, lib, mtl
-, profunctors, semigroupoids, tagged, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "kan-extensions";
-  version = "5.2.5";
-  sha256 = "b914dccc040caf1d8764b99df1028dad3e4fdf46c262192e54b59c9da66ead22";
-  revision = "1";
-  editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    adjunctions array base comonad containers contravariant
-    distributive free invariant mtl profunctors semigroupoids tagged
-    transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/kan-extensions/";
-  description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/keys.nix b/pkgs/keys.nix
index 13f2db0de3bc2efb6de128fdf98cab6b027c6b38..7daf8b34a217de7d44b73bb5406b9598a574711e 100644
--- a/pkgs/keys.nix
+++ b/pkgs/keys.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "keys";
   version = "3.12.3";
   sha256 = "d51e4288a3cc89c5be3327a499212a651549a58af78d0dfeb2cd80e19ce66646";
-  revision = "4";
-  editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9";
+  revision = "5";
+  editedCabalFile = "0qp6xvqjw4k98g3di4pnv7hvlhgfcab28nm3pdi48c1gk14qv1kf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/language-haskell-extract.nix b/pkgs/language-haskell-extract.nix
deleted file mode 100644
index 22d290675d15a32b3d6f732dfac5ae6beadcf6d1..0000000000000000000000000000000000000000
--- a/pkgs/language-haskell-extract.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, fetchgit, lib, regex-posix, template-haskell
-}:
-mkDerivation {
-  pname = "language-haskell-extract";
-  version = "0.2.3";
-  src = fetchgit {
-    url = "https://github.com/chessai/template-helper";
-    sha256 = "17n6k5myycklbc2grhz654idwmmzjcw217gy2w1h9jlaqv6c52q7";
-    rev = "f654f1e7ef47c591bb5ea23f1234289f99d09d05";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base regex-posix template-haskell ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/finnsson/template-helper";
-  description = "Module to automatically extract functions from the local code";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/language-nix.nix b/pkgs/language-nix.nix
deleted file mode 100644
index bf926488897ced8f38ee56a62df7fc789fb43c72..0000000000000000000000000000000000000000
--- a/pkgs/language-nix.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, lens, lib, parsec-class
-, pretty
-}:
-mkDerivation {
-  pname = "language-nix";
-  version = "2.2.0";
-  sha256 = "fd67425268707de245e4b1f5dfee61e091c417106c95dbbe188abc16c23800d3";
-  revision = "1";
-  editedCabalFile = "0g4hq729bz128sf3ifd8rbfamwa8mqqcnhbc3qxnpz1myzvxhnjk";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq lens parsec-class pretty QuickCheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
-  description = "Data types and functions to represent the Nix language";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lens-aeson.nix b/pkgs/lens-aeson.nix
deleted file mode 100644
index fbc4b05c699bafdd47dc3667a931cbeda81e8917..0000000000000000000000000000000000000000
--- a/pkgs/lens-aeson.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, bytestring, lens, lib
-, scientific, text, text-short, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "lens-aeson";
-  version = "1.2.2";
-  sha256 = "14d13885b47fd9448a8f2019eda600b4556c784b02d1b86a6dc114b13f789573";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base bytestring lens scientific text text-short
-    unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/lens/lens-aeson/";
-  description = "Law-abiding lenses for aeson";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lens-family-core.nix b/pkgs/lens-family-core.nix
deleted file mode 100644
index 252fbad8e3b7edbb2e773b48cab3e0f96763b242..0000000000000000000000000000000000000000
--- a/pkgs/lens-family-core.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, containers, lib, transformers }:
-mkDerivation {
-  pname = "lens-family-core";
-  version = "2.1.2";
-  sha256 = "1b5a997276c8b77a96f99f48b95b204d34f3bb84fa3691747cd30bc8c76873b6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Haskell 2022 Lens Families";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lens.nix b/pkgs/lens.nix
deleted file mode 100644
index 8f81bb82ffabb3a482e0583caeffb83bf23a5c1e..0000000000000000000000000000000000000000
--- a/pkgs/lens.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, array, assoc, base, base-compat
-, base-orphans, bifunctors, bytestring, call-stack, comonad
-, containers, contravariant, criterion, deepseq, distributive
-, exceptions, filepath, free, generic-deriving, ghc-prim, hashable
-, indexed-traversable, indexed-traversable-instances
-, kan-extensions, lib, mtl, parallel, profunctors, reflection
-, semigroupoids, simple-reflect, strict, tagged, template-haskell
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text, th-abstraction, these, transformers, transformers-compat
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "lens";
-  version = "5.2.2";
-  sha256 = "855c58c51935bd86e61c5886862fb36cb2dc4c63240d96d93c538e8f54ff76e3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array assoc base base-orphans bifunctors bytestring call-stack
-    comonad containers contravariant distributive exceptions filepath
-    free ghc-prim hashable indexed-traversable
-    indexed-traversable-instances kan-extensions mtl parallel
-    profunctors reflection semigroupoids strict tagged template-haskell
-    text th-abstraction these transformers transformers-compat
-    unordered-containers vector
-  ];
-  testHaskellDepends = [
-    base bytestring containers deepseq HUnit mtl QuickCheck
-    simple-reflect test-framework test-framework-hunit
-    test-framework-quickcheck2 text transformers
-  ];
-  benchmarkHaskellDepends = [
-    base base-compat bytestring comonad containers criterion deepseq
-    generic-deriving transformers unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/lens/";
-  description = "Lenses, Folds and Traversals";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/libsystemd-journal.nix b/pkgs/libsystemd-journal.nix
index 48f432279348625b83d8c4218c2ae45253613ee7..d5ac12fcd117d1daaa9e65a30f29eea690de3ca6 100644
--- a/pkgs/libsystemd-journal.nix
+++ b/pkgs/libsystemd-journal.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "libsystemd-journal";
-  version = "1.4.5";
-  sha256 = "a8c7a2140d0046cb71887fc7ff6f8885feb3bac966d01d9a83b25226b5778f06";
+  version = "1.4.5.1";
+  sha256 = "16da6bd693c0112d2d3567fcc06a65b3e1844eb9c107b5692973216cd1a857b4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -22,7 +22,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/ocharles/libsystemd-journal";
+  homepage = "https://github.com/ocharles/libsystemd-journal";
   description = "Haskell bindings to libsystemd-journal";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/libxml.nix b/pkgs/libxml.nix
deleted file mode 100644
index 14c79a0c3f6d23d96af522c8d98a22481e940433..0000000000000000000000000000000000000000
--- a/pkgs/libxml.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, bytestring, lib, libxml2, mtl }:
-mkDerivation {
-  pname = "libxml";
-  version = "0.1.1";
-  sha256 = "d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07";
-  configureFlags = [
-    "--extra-include-dir=${libxml2.dev}/include/libxml2"
-  ];
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring mtl ];
-  librarySystemDepends = [ libxml2 ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Binding to libxml2";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/libyaml.nix b/pkgs/libyaml.nix
deleted file mode 100644
index 7738d30a37c57c44d6482ebe91ea17c6f3326cbe..0000000000000000000000000000000000000000
--- a/pkgs/libyaml.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, bytestring, conduit, lib, resourcet }:
-mkDerivation {
-  pname = "libyaml";
-  version = "0.1.2";
-  sha256 = "8f42d66f199fcaee255326f8f770d88b0670df56b5eb78002d6058f3a45e97b5";
-  revision = "1";
-  editedCabalFile = "00f1rag6sd7c8kza2agw9089p9vf21iiga2aq41nbf6d3yqn7dkz";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring conduit resourcet ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/yaml#readme";
-  description = "Low-level, streaming YAML interface";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lifted-async.nix b/pkgs/lifted-async.nix
deleted file mode 100644
index 5f3e066b717a7b09df8f892e10c58ca5f84d1eee..0000000000000000000000000000000000000000
--- a/pkgs/lifted-async.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, HUnit, async, base, constraints, deepseq, lib
-, lifted-base, monad-control, mtl, tasty, tasty-bench
-, tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
-}:
-mkDerivation {
-  pname = "lifted-async";
-  version = "0.10.2.4";
-  sha256 = "9bed4dee15f40c35a4d92a2d8ca29e4a9fe7904a5b773486dfef58040a3ebe5d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base constraints lifted-base monad-control transformers-base
-  ];
-  testHaskellDepends = [
-    async base HUnit lifted-base monad-control mtl tasty
-    tasty-expected-failure tasty-hunit tasty-th
-  ];
-  benchmarkHaskellDepends = [ async base deepseq tasty-bench ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/maoe/lifted-async";
-  description = "Run lifted IO operations asynchronously and wait for their results";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lifted-base.nix b/pkgs/lifted-base.nix
deleted file mode 100644
index 2eaa55f933ae78ff4972ed66ee695395e7e7fd65..0000000000000000000000000000000000000000
--- a/pkgs/lifted-base.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, HUnit, base, criterion, lib, monad-control
-, monad-peel, test-framework, test-framework-hunit, transformers
-, transformers-base, transformers-compat
-}:
-mkDerivation {
-  pname = "lifted-base";
-  version = "0.2.3.12";
-  sha256 = "c134a95f56750aae806e38957bb03c59627cda16034af9e00a02b699474317c5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base monad-control transformers-base ];
-  testHaskellDepends = [
-    base HUnit monad-control test-framework test-framework-hunit
-    transformers transformers-base transformers-compat
-  ];
-  benchmarkHaskellDepends = [
-    base criterion monad-control monad-peel transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/basvandijk/lifted-base";
-  description = "lifted IO operations from the base library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/linear-base.nix b/pkgs/linear-base.nix
index 1b036e18e654ce265da6caeba2a41da19f8a73cb..889b583bcbd1cc6089ff3356c53b011bce810c14 100644
--- a/pkgs/linear-base.nix
+++ b/pkgs/linear-base.nix
@@ -1,15 +1,14 @@
-{ mkDerivation, MonadRandom, base, containers, deepseq, gauge
-, ghc-prim, hashable, hashtables, hedgehog, inspection-testing, lib
+{ mkDerivation, MonadRandom, base, containers, deepseq, ghc-prim
+, hashable, hashtables, hedgehog, inspection-testing, lib
 , linear-generics, mmorph, primitive, random, random-shuffle
-, storable-tuple, tasty, tasty-hedgehog, tasty-inspection-testing
-, text, transformers, unordered-containers, vector
+, storable-tuple, tasty, tasty-bench, tasty-hedgehog
+, tasty-inspection-testing, text, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "linear-base";
-  version = "0.3.1";
-  sha256 = "10ec4ba4068762362f9921e824ea06e3a69efa08d89ad593e8a5a7113d5fa8be";
-  revision = "1";
-  editedCabalFile = "153nkw2i7n22xzfj8q2xmzsh77pr7pay8v3gc1xli491qmsc0fcd";
+  version = "0.4.0";
+  sha256 = "bcefa019ec293890b464097098bf55f3e2c19913d0246cc3ff49a024ecb25d24";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -23,8 +22,8 @@ mkDerivation {
     vector
   ];
   benchmarkHaskellDepends = [
-    base deepseq gauge hashable hashtables MonadRandom random
-    random-shuffle unordered-containers vector
+    base containers deepseq hashable hashtables MonadRandom random
+    random-shuffle tasty-bench unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/linear.nix b/pkgs/linear.nix
index 56b6bbe6822c95ddde224192dba6cfb6d605984c..a3a3c777143f4628645b6e020b0509abfd00265a 100644
--- a/pkgs/linear.nix
+++ b/pkgs/linear.nix
@@ -10,8 +10,8 @@ mkDerivation {
   pname = "linear";
   version = "1.22";
   sha256 = "cfe43e392d0e9b2fd5647bde962b0678681de580260ad30e5f29ae490a03b9b5";
-  revision = "1";
-  editedCabalFile = "1p94bq3pwqvj4qd1lp0w84k514xd9vib76gw0d16q1xh27c2sz4h";
+  revision = "3";
+  editedCabalFile = "1fmq4i3qimccjsn7859q1rk7adpcy9d3zvybl0n7kljn04ag00k4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/list-t.nix b/pkgs/list-t.nix
index 8198f037530624631d995953e075b3cf72e97bc9..91be156cce259b58f3a8ffb5d71e85a45760d090 100644
--- a/pkgs/list-t.nix
+++ b/pkgs/list-t.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "list-t";
-  version = "1.0.5.6";
-  sha256 = "4f13658a166fc5b07ef57145ef266e3fb2426ed3c96bff89e556e12de7608bc6";
+  version = "1.0.5.7";
+  sha256 = "40928967728c7c96363309b372f415ca1729de0951c78ea1fa37f839687d6b46";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/list-transformer.nix b/pkgs/list-transformer.nix
index 52c03d0211dbceca1993ac625eb6175184d38e36..93fc6092872b05457953cfcd44a94e542149248d 100644
--- a/pkgs/list-transformer.nix
+++ b/pkgs/list-transformer.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, doctest, lib, mmorph, mtl }:
 mkDerivation {
   pname = "list-transformer";
-  version = "1.0.9";
-  sha256 = "b90b23921cdab8b38278b2129130fd0e0e7c7a04ca8c4e02f64a6bea7af66dd3";
-  revision = "1";
-  editedCabalFile = "1d41pbd7kg8im5bvzhkndr6lr106rpd7m1pqb39zgnj5cbmgaql3";
+  version = "1.1.0";
+  sha256 = "3deb2e12055d0fc56dc19471152f0721348ba66bf91f61e2d4658c4d2d132a18";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/logging-facade.nix b/pkgs/logging-facade.nix
deleted file mode 100644
index 747907e9a7f6479877ac76de270b0d9e1d352e1f..0000000000000000000000000000000000000000
--- a/pkgs/logging-facade.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, call-stack, hspec, hspec-discover, lib
-, transformers
-}:
-mkDerivation {
-  pname = "logging-facade";
-  version = "0.3.1";
-  sha256 = "2b16b3353b77c6ab92a82dc3f04724447a67f02c76d50c274177d8778e14c166";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base call-stack transformers ];
-  testHaskellDepends = [ base hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sol/logging-facade#readme";
-  description = "Simple logging abstraction that allows multiple back-ends";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/logict.nix b/pkgs/logict.nix
deleted file mode 100644
index 924ab0a45e24216a9dfc31c43ff41e93a5b11d25..0000000000000000000000000000000000000000
--- a/pkgs/logict.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, async, base, lib, mtl, tasty, tasty-hunit
-, transformers
-}:
-mkDerivation {
-  pname = "logict";
-  version = "0.8.1.0";
-  sha256 = "d3dc47581c8484220e57c8f827e0d44f8c04f054aba9ba1797ee15b897e3b813";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base mtl transformers ];
-  testHaskellDepends = [
-    async base mtl tasty tasty-hunit transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Bodigrim/logict#readme";
-  description = "A backtracking logic-programming monad";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lpeg.nix b/pkgs/lpeg.nix
index 90db3d31b1a0376b4f26475bfca0d5e4638b552c..d15d448c0e9f26e4596ce09a43a6a4c770e52217 100644
--- a/pkgs/lpeg.nix
+++ b/pkgs/lpeg.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, lua, tasty, tasty-hunit }:
 mkDerivation {
   pname = "lpeg";
-  version = "1.0.4";
-  sha256 = "24084721a225f133682aa12c5ff4f65c7ea7b6b03894c6af0504864bea2054bb";
+  version = "1.1.0";
+  sha256 = "411509eb9b9142299e76a022d1fcf56ce8e255d5e0a0d1d8b46fcddc3d195b79";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/lsp-test.nix b/pkgs/lsp-test.nix
index bb29f007c1995091a4aa5c37f369ca6bff8aa6e3..2e3aa16e8686a5c4f56fe2cda59b3d16b4fe1307 100644
--- a/pkgs/lsp-test.nix
+++ b/pkgs/lsp-test.nix
@@ -1,27 +1,27 @@
 { mkDerivation, Diff, Glob, aeson, aeson-pretty, ansi-terminal
 , async, base, bytestring, co-log-core, conduit, conduit-parse
 , containers, data-default, directory, exceptions, extra, filepath
-, hspec, lens, lib, lsp, lsp-types, mtl, parser-combinators
-, process, some, text, time, transformers, unix, unliftio
-, unordered-containers
+, hspec, lens, lens-aeson, lib, lsp, lsp-types, mtl
+, parser-combinators, process, row-types, some, text, time
+, transformers, unix, unliftio
 }:
 mkDerivation {
   pname = "lsp-test";
-  version = "0.14.1.0";
-  sha256 = "e13ae2be422ae1344e8ab9f535f20432b97832be2d0f15a68e631660ffad6435";
+  version = "0.16.0.0";
+  sha256 = "0ea6672ce6287329c6c731a95aef730a3ed8f3ecd0fbf357ad9ea08f6dda5d28";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson aeson-pretty ansi-terminal async base bytestring co-log-core
     conduit conduit-parse containers data-default Diff directory
-    exceptions filepath Glob lens lsp lsp-types mtl parser-combinators
-    process some text time transformers unix unordered-containers
+    exceptions filepath Glob lens lens-aeson lsp lsp-types mtl
+    parser-combinators process row-types some text time transformers
+    unix
   ];
   testHaskellDepends = [
-    aeson base co-log-core data-default directory filepath hspec lens
-    lsp mtl parser-combinators process text unliftio
-    unordered-containers
+    aeson base co-log-core containers data-default directory filepath
+    hspec lens lsp mtl parser-combinators process text unliftio
   ];
   testToolDepends = [ lsp ];
   benchmarkHaskellDepends = [ base extra lsp process ];
diff --git a/pkgs/lsp-types.nix b/pkgs/lsp-types.nix
index da65c5f2e1c29ce78eea7772c012f8c8b2bdde97..842ee4a8ec39c012903fcef3a7836bc6eae11531 100644
--- a/pkgs/lsp-types.nix
+++ b/pkgs/lsp-types.nix
@@ -1,24 +1,31 @@
 { mkDerivation, Diff, QuickCheck, aeson, base, binary, containers
-, data-default, deepseq, dlist, exceptions, filepath, hashable
-, hspec, hspec-discover, lens, lib, mod, mtl, network-uri
-, quickcheck-instances, safe, scientific, some, template-haskell
-, text, tuple, unordered-containers
+, data-default, deepseq, directory, dlist, exceptions, file-embed
+, filepath, hashable, hspec, hspec-discover, indexed-traversable
+, indexed-traversable-instances, lens, lens-aeson, lib, mod, mtl
+, network-uri, prettyprinter, quickcheck-instances, regex
+, row-types, safe, some, template-haskell, text
+, unordered-containers
 }:
 mkDerivation {
   pname = "lsp-types";
-  version = "1.6.0.0";
-  sha256 = "385dc4fb3c7fcdb5c6cb26cf9f589b879cdb28dc7a452a6dc628dec369c19802";
+  version = "2.0.2.0";
+  sha256 = "4686b80ad6b98d7ca773bf5a25a0797093c96b236da8089690ec3ab4462f0969";
   isLibrary = true;
-  isExecutable = false;
+  isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base binary containers data-default deepseq Diff dlist
-    exceptions filepath hashable lens mod mtl network-uri safe
-    scientific some template-haskell text unordered-containers
+    exceptions file-embed filepath hashable indexed-traversable
+    indexed-traversable-instances lens lens-aeson mod mtl network-uri
+    prettyprinter row-types safe some template-haskell text
+    unordered-containers
+  ];
+  executableHaskellDepends = [
+    base containers directory filepath mtl prettyprinter regex text
   ];
   testHaskellDepends = [
     aeson base filepath hspec lens network-uri QuickCheck
-    quickcheck-instances text tuple
+    quickcheck-instances row-types text
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
diff --git a/pkgs/lsp.nix b/pkgs/lsp.nix
index d7c55258c17a9b1e59c69edbebbf5aaf42c76e84..01fa2318c5c2a9dce1b8a9eca61c9684ba42c0cf 100644
--- a/pkgs/lsp.nix
+++ b/pkgs/lsp.nix
@@ -1,25 +1,26 @@
 { mkDerivation, aeson, async, attoparsec, base, bytestring
 , co-log-core, containers, data-default, directory, exceptions
-, filepath, hashable, hspec, hspec-discover, lens, lib, lsp-types
-, mtl, prettyprinter, random, sorted-list, stm, temporary, text
-, text-rope, transformers, unliftio-core, unordered-containers
-, uuid
+, filepath, hashable, hspec, hspec-discover, lens, lens-aeson, lib
+, lsp-types, mtl, prettyprinter, random, row-types, sorted-list
+, stm, temporary, text, text-rope, transformers, unliftio-core
+, unordered-containers, uuid
 }:
 mkDerivation {
   pname = "lsp";
-  version = "1.6.0.0";
-  sha256 = "896803766e8ceabeacc72743f4b92cf7766b2a1f09be270b29d0a39692b00470";
+  version = "2.2.0.0";
+  sha256 = "592a2d5df3bfc100320ee98d978694dd7d8e5568364daab42f767fb94f9f1d5b";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson async attoparsec base bytestring co-log-core containers
-    data-default directory exceptions filepath hashable lens lsp-types
-    mtl prettyprinter random sorted-list stm temporary text text-rope
-    transformers unliftio-core unordered-containers uuid
+    data-default directory exceptions filepath hashable lens lens-aeson
+    lsp-types mtl prettyprinter random row-types sorted-list stm
+    temporary text text-rope transformers unliftio-core
+    unordered-containers uuid
   ];
   testHaskellDepends = [
-    base containers hspec sorted-list text text-rope
+    base containers hspec row-types sorted-list text text-rope
     unordered-containers
   ];
   testToolDepends = [ hspec-discover ];
diff --git a/pkgs/lucid.nix b/pkgs/lucid.nix
index a15428d02d60814035846f15c54fefefeea942c0..5b0366fcbd63b768dda0cdf5aa8f3c3f9ef91df2 100644
--- a/pkgs/lucid.nix
+++ b/pkgs/lucid.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "lucid";
   version = "2.11.20230408";
   sha256 = "0f112990fee9c5b1c62c64c926147272534781ed8a7225d39dd0248a670f441d";
+  revision = "1";
+  editedCabalFile = "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/lukko.nix b/pkgs/lukko.nix
index e4fa3f88886ad7feff6eb3eb4b668b932feaa35e..b6a3ff5e195da9efd4e7262404a352901349cf72 100644
--- a/pkgs/lukko.nix
+++ b/pkgs/lukko.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "lukko";
   version = "0.1.1.3";
   sha256 = "a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f";
-  revision = "4";
-  editedCabalFile = "0ij1wcciiplk381xzxr7xcnywfbh5caflffnvlzqmg8bz3j4xdcs";
+  revision = "5";
+  editedCabalFile = "01szqdkxgk00anqifx1xvnyim6j9lv02aqdshdbls376vi2nay0p";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/managed.nix b/pkgs/managed.nix
deleted file mode 100644
index cfbbefd43c7a6804c04bc2e20e5503bfce559391..0000000000000000000000000000000000000000
--- a/pkgs/managed.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib, transformers }:
-mkDerivation {
-  pname = "managed";
-  version = "1.0.10";
-  sha256 = "3a22ca9d50c1efc2725ca244d60df0a79118119bef1aa2128589d93bbf99f759";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A monad for managed values";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/markdown-unlit.nix b/pkgs/markdown-unlit.nix
index ec238e779e1b7219f3546db2a78ac99ee120a6dd..b44c123ab48d1159ae3716a80a5a6f933bb33dac 100644
--- a/pkgs/markdown-unlit.nix
+++ b/pkgs/markdown-unlit.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "markdown-unlit";
-  version = "0.5.1";
-  sha256 = "c70ef68ca9a9513ce26eba6dd4cf7ce1cb6b17f5ab47dfc1a9d47c544db15f5a";
+  version = "0.6.0";
+  sha256 = "d38b18581fe4da33bcfcc5d368c48a88f27e9801035e4ace59776e14c7787b5a";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/math-functions.nix b/pkgs/math-functions.nix
deleted file mode 100644
index 01f325324fdcb1aacb8721e2f7a26faada2af523..0000000000000000000000000000000000000000
--- a/pkgs/math-functions.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, base, data-default-class, deepseq, erf
-, gauge, lib, primitive, random, tasty, tasty-hunit
-, tasty-quickcheck, vector, vector-th-unbox
-}:
-mkDerivation {
-  pname = "math-functions";
-  version = "0.3.4.2";
-  sha256 = "c1e50ac0d23492b684cce33a9a979e1315ac144175b54f82eade9b8b1885c1a3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base data-default-class deepseq primitive vector
-  ];
-  testHaskellDepends = [
-    base data-default-class deepseq erf primitive QuickCheck tasty
-    tasty-hunit tasty-quickcheck vector vector-th-unbox
-  ];
-  benchmarkHaskellDepends = [
-    base data-default-class gauge random vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/bos/math-functions";
-  description = "Collection of tools for numeric computations";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/megaparsec.nix b/pkgs/megaparsec.nix
deleted file mode 100644
index 70537483f9b0d12d253c60b065072d16118e0f91..0000000000000000000000000000000000000000
--- a/pkgs/megaparsec.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, bytestring, case-insensitive, containers
-, criterion, deepseq, lib, mtl, parser-combinators, scientific
-, text, transformers, weigh
-}:
-mkDerivation {
-  pname = "megaparsec";
-  version = "9.3.0";
-  sha256 = "19fcb0846f0e609a242790cae828247e8b70b8739ef24c11f92d52c8862e6005";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring case-insensitive containers deepseq mtl
-    parser-combinators scientific text transformers
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring containers criterion deepseq text weigh
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mrkkrp/megaparsec";
-  description = "Monadic parser combinators";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/memory.nix b/pkgs/memory.nix
deleted file mode 100644
index ab3c69230cbef987452bad222a21f46881ee32ba..0000000000000000000000000000000000000000
--- a/pkgs/memory.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, basement, bytestring, deepseq, foundation
-, ghc-prim, lib
-}:
-mkDerivation {
-  pname = "memory";
-  version = "0.18.0";
-  sha256 = "fd4eb6f638e24b81b4e6cdd68772a531726f2f67686c8969d3407d82f7862e3e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base basement bytestring deepseq ghc-prim
-  ];
-  testHaskellDepends = [ base basement bytestring foundation ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/vincenthz/hs-memory";
-  description = "memory and related abstraction stuff";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mersenne-random.nix b/pkgs/mersenne-random.nix
deleted file mode 100644
index a26aa6dccc5f40ae908931bed52bbf19d66567dd..0000000000000000000000000000000000000000
--- a/pkgs/mersenne-random.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, old-time }:
-mkDerivation {
-  pname = "mersenne-random";
-  version = "1.0.0.1";
-  sha256 = "bcee8af246b6967b0c4326f3eec57611818dacc729b7c6bd42e1d363f9f878a4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base old-time ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://code.haskell.org/~dons/code/mersenne-random";
-  description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mfsolve.nix b/pkgs/mfsolve.nix
index 403618b8429ad5c556857eb64bd4ec5a9e53c41d..d052bc1e64ecde5d89874b314b37f00ca4dc9bc7 100644
--- a/pkgs/mfsolve.nix
+++ b/pkgs/mfsolve.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "mfsolve";
-  version = "0.3.2.1";
-  sha256 = "a225068707a71fdef595cdde77336c1b609b14527e023bf42ab2f86dd9d70da4";
-  revision = "1";
-  editedCabalFile = "0938ji6l1bx787lxcw6rzjwskm9vxm615cvx7hxpbwp0hbxrj5sa";
+  version = "0.3.2.2";
+  sha256 = "093fe312090e7e59355c8d23efb54cfe9bd0f81a2fbfec6c138d34f03a188f81";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/microlens-aeson.nix b/pkgs/microlens-aeson.nix
index d8872c6476e2d699fc992d319b14c30656ea8886..eadae8d97553b519b0e78fa1c2b0672b92707895 100644
--- a/pkgs/microlens-aeson.nix
+++ b/pkgs/microlens-aeson.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "microlens-aeson";
-  version = "2.5.0";
-  sha256 = "a28d9c95d14bfccc73856b4d0cbe8b51ec762712ab228121a54878b2c402b840";
+  version = "2.5.1";
+  sha256 = "f7755c46d8cd54ed2d3031c34ac075a6715d40fc19c8edf681c6e6d3c2c4e50a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/microlens-ghc.nix b/pkgs/microlens-ghc.nix
index 137705fd0d369f45ee32455440aa960adb87bd7e..27fe162b1f0a92b5ad9b99e03328fa81c6dea73d 100644
--- a/pkgs/microlens-ghc.nix
+++ b/pkgs/microlens-ghc.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "microlens-ghc";
-  version = "0.4.14.1";
-  sha256 = "56709b10a1b3feba4fc107d7302a51020d90f893b8aac913f8b85750f663dcc0";
+  version = "0.4.14.2";
+  sha256 = "58e5c5a6309d1145ac9062e7759d25184f14d451111b5783c103537c6561cd9d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,7 +18,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/monadfix/microlens";
+  homepage = "http://github.com/stevenfontanella/microlens";
   description = "microlens + array, bytestring, containers, transformers";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/microlens-mtl.nix b/pkgs/microlens-mtl.nix
deleted file mode 100644
index 6c2b2383b73d6f0bc8545701d2d3fca63c47a34a..0000000000000000000000000000000000000000
--- a/pkgs/microlens-mtl.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, lib, microlens, mtl, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "microlens-mtl";
-  version = "0.2.0.3";
-  sha256 = "4d6b6af37179814fe47e11763ea61b423b698bc15869f94e82c6a5e9fd079fc6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base microlens mtl transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/monadfix/microlens";
-  description = "microlens support for Reader/Writer/State from mtl";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/microlens-platform.nix b/pkgs/microlens-platform.nix
index ade19bb0648e2b76b37e32e18ba84d152b727240..3c9966a41411bb797caae3431ed09cb15b496835 100644
--- a/pkgs/microlens-platform.nix
+++ b/pkgs/microlens-platform.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "microlens-platform";
-  version = "0.4.3.3";
-  sha256 = "5ec7853b372ede912d727368820da5a14455361e1f8a8a7701705cc80fa8468f";
+  version = "0.4.3.4";
+  sha256 = "d09b1d18f32f16070b6e3bf9c182bdb5013f15feee1305bcb939f2330cf84706";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,7 +19,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/monadfix/microlens";
+  homepage = "http://github.com/stevenfontanella/microlens";
   description = "microlens + all batteries included (best for apps)";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/microlens-th.nix b/pkgs/microlens-th.nix
deleted file mode 100644
index 4f6c522cd4a9f289107ec8a393378046093d6beb..0000000000000000000000000000000000000000
--- a/pkgs/microlens-th.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, containers, lib, microlens, tagged
-, template-haskell, th-abstraction, transformers
-}:
-mkDerivation {
-  pname = "microlens-th";
-  version = "0.4.3.13";
-  sha256 = "e73bcd5af020ca705684725ddfded4567130f117d70fe17b4f898a19cce281bc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers microlens template-haskell th-abstraction
-    transformers
-  ];
-  testHaskellDepends = [ base microlens tagged ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/stevenfontanella/microlens";
-  description = "Automatic generation of record lenses for microlens";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/microstache.nix b/pkgs/microstache.nix
index 0118ab0d4d7b391686d756474fd159d6c3a62653..7fe611989592da4932ed6cccfe55c2c956c5286e 100644
--- a/pkgs/microstache.nix
+++ b/pkgs/microstache.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "microstache";
   version = "1.0.2.3";
   sha256 = "df7a13175783603bfb095e7a5eda9a24eec7d5fd490946d107ad578bb436d29a";
-  revision = "1";
-  editedCabalFile = "04chnz0dcf30a5x90kwqdiad1qbyimmiqgbm38b6m3w72k408hfi";
+  revision = "3";
+  editedCabalFile = "0bl84aym5p31wlyqwh5vicyrdw3nvig65xxdlx4ql8hjr71l7mvi";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/mime-types.nix b/pkgs/mime-types.nix
deleted file mode 100644
index 1544fb88e03b98ac8a1f44557aa84eb3fbe78891..0000000000000000000000000000000000000000
--- a/pkgs/mime-types.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, bytestring, containers, lib, text }:
-mkDerivation {
-  pname = "mime-types";
-  version = "0.1.1.0";
-  sha256 = "ebd01ed4e37142cb3233d4ffe55fe879b64d4a0b5802c8bc6afa1c7670f9e11b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring containers text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/wai";
-  description = "Basic mime-type handling types and functions";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/minio-hs.nix b/pkgs/minio-hs.nix
index cb43a80fdda5237678a888887695deeefafa8451..c2c987d022db66630c50c63ad0e9718bb7a31d3e 100644
--- a/pkgs/minio-hs.nix
+++ b/pkgs/minio-hs.nix
@@ -1,35 +1,35 @@
 { mkDerivation, QuickCheck, aeson, base, base64-bytestring, binary
 , bytestring, case-insensitive, conduit, conduit-extra, connection
-, cryptonite, cryptonite-conduit, digest, directory, exceptions
-, filepath, http-client, http-client-tls, http-conduit, http-types
-, ini, lib, memory, network-uri, raw-strings-qq, relude, resourcet
-, retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-, text, time, transformers, unliftio, unliftio-core
+, cryptonite, cryptonite-conduit, digest, directory, filepath
+, http-client, http-client-tls, http-conduit, http-types, ini, lib
+, memory, network-uri, raw-strings-qq, relude, resourcet, retry
+, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
+, time, time-units, transformers, unliftio, unliftio-core
 , unordered-containers, xml-conduit
 }:
 mkDerivation {
   pname = "minio-hs";
-  version = "1.6.0";
-  sha256 = "e7cea5c2b851c01a60311e24d337e3cc11b42dce82a936ca249c9e1f05a8c1dd";
+  version = "1.7.0";
+  sha256 = "8fc744198bbd9dc0794b608c0d904fe251cd8c5886013b2f6cf1f784f8159694";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson base base64-bytestring binary bytestring case-insensitive
     conduit conduit-extra connection cryptonite cryptonite-conduit
-    digest directory exceptions filepath http-client http-client-tls
-    http-conduit http-types ini memory network-uri raw-strings-qq
-    relude resourcet retry text time transformers unliftio
-    unliftio-core unordered-containers xml-conduit
+    digest directory filepath http-client http-client-tls http-conduit
+    http-types ini memory network-uri relude resourcet retry text time
+    time-units transformers unliftio unliftio-core unordered-containers
+    xml-conduit
   ];
   testHaskellDepends = [
     aeson base base64-bytestring binary bytestring case-insensitive
     conduit conduit-extra connection cryptonite cryptonite-conduit
-    digest directory exceptions filepath http-client http-client-tls
-    http-conduit http-types ini memory network-uri QuickCheck
-    raw-strings-qq relude resourcet retry tasty tasty-hunit
-    tasty-quickcheck tasty-smallcheck text time transformers unliftio
-    unliftio-core unordered-containers xml-conduit
+    digest directory filepath http-client http-client-tls http-conduit
+    http-types ini memory network-uri QuickCheck raw-strings-qq relude
+    resourcet retry tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+    text time time-units transformers unliftio unliftio-core
+    unordered-containers xml-conduit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/mmap.nix b/pkgs/mmap.nix
deleted file mode 100644
index 3a187f2d6a3452763d9349d74bc44e7203ed1b1b..0000000000000000000000000000000000000000
--- a/pkgs/mmap.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, lib }:
-mkDerivation {
-  pname = "mmap";
-  version = "0.5.9";
-  sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Memory mapped files for POSIX and Windows";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mmorph.nix b/pkgs/mmorph.nix
deleted file mode 100644
index e38f2ae0c7341f95bd697834d57c1c3b36923942..0000000000000000000000000000000000000000
--- a/pkgs/mmorph.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, lib, mtl, transformers, transformers-compat
-}:
-mkDerivation {
-  pname = "mmorph";
-  version = "1.2.0";
-  sha256 = "61338058eb676b466a462ca45d59f436a77a3bd6b816e4268c6d88522b6a4280";
-  revision = "3";
-  editedCabalFile = "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base mtl transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Monad morphisms";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mockery.nix b/pkgs/mockery.nix
deleted file mode 100644
index ad42675a5ef5244f9b955b23e09ab47e1620035a..0000000000000000000000000000000000000000
--- a/pkgs/mockery.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, base-compat, bytestring, directory, filepath
-, hspec, lib, logging-facade, temporary
-}:
-mkDerivation {
-  pname = "mockery";
-  version = "0.3.5";
-  sha256 = "b7a1edacd3d32dc7f0e28c67877209d3ca3551d1da186f6445f825f3477dd727";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat bytestring directory filepath logging-facade
-    temporary
-  ];
-  testHaskellDepends = [
-    base base-compat bytestring directory filepath hspec logging-facade
-    temporary
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Support functions for automated testing";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/modern-uri.nix b/pkgs/modern-uri.nix
index 42271a2a49a42124ec1263715e20abfe047e4c21..5e1f3b2dc7ddecc2f2491204a02254b62c7bf778 100644
--- a/pkgs/modern-uri.nix
+++ b/pkgs/modern-uri.nix
@@ -1,28 +1,27 @@
-{ mkDerivation, QuickCheck, base, bytestring, containers
-, contravariant, criterion, deepseq, exceptions, hashable, hspec
-, hspec-discover, hspec-megaparsec, lib, megaparsec, mtl
-, profunctors, reflection, tagged, template-haskell, text, weigh
+{ mkDerivation, QuickCheck, base, bytestring, containers, criterion
+, deepseq, exceptions, hashable, hspec, hspec-discover
+, hspec-megaparsec, lib, megaparsec, mtl, profunctors, reflection
+, tagged, template-haskell, text, weigh
 }:
 mkDerivation {
   pname = "modern-uri";
-  version = "0.3.6.0";
-  sha256 = "cf3c5b2cbbab9b8f3c171488ff8056dd1c37de011301090345689fc7138d43d2";
+  version = "0.3.6.1";
+  sha256 = "0246f9cfced1227abe3a6403eeacc6b5f79f7e3319759a4dd1fd341c12454fe9";
   revision = "1";
-  editedCabalFile = "0bfg0m3iynx41am17l9gb8di3kaldz9129s34vsc1qx5y13dnwl3";
+  editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring containers contravariant deepseq exceptions
-    hashable megaparsec mtl profunctors QuickCheck reflection tagged
-    template-haskell text
+    base bytestring containers deepseq exceptions hashable megaparsec
+    mtl profunctors QuickCheck reflection tagged template-haskell text
   ];
   testHaskellDepends = [
     base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base bytestring criterion deepseq megaparsec text weigh
+    base bytestring criterion megaparsec text weigh
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/monad-control.nix b/pkgs/monad-control.nix
deleted file mode 100644
index 8e7dbc74c84100d73eb6e41d771a44ee9c7996cb..0000000000000000000000000000000000000000
--- a/pkgs/monad-control.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, lib, stm, transformers, transformers-base
-, transformers-compat
-}:
-mkDerivation {
-  pname = "monad-control";
-  version = "1.0.3.1";
-  sha256 = "ae0baea04d99375ef788140367179994a7178d400a8ce0d9026846546772713c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base stm transformers transformers-base transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/basvandijk/monad-control";
-  description = "Lift control operations, like exception catching, through monad transformers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monad-logger.nix b/pkgs/monad-logger.nix
index 149467d09e9bb9ec2ae543410d2e9317dbb8b440..f88fb156aa64f029e1aec178fbbe8e2658b720fa 100644
--- a/pkgs/monad-logger.nix
+++ b/pkgs/monad-logger.nix
@@ -6,10 +6,8 @@
 }:
 mkDerivation {
   pname = "monad-logger";
-  version = "0.3.39";
-  sha256 = "d3f23b047dda7a3f74b89289a3171c1059d50898f63f671006baab61e01729a5";
-  revision = "1";
-  editedCabalFile = "0nj4qpmp6i5lmfbk7f1shljx8g2062fq6y857y4f9avp1cb9zm7d";
+  version = "0.3.40";
+  sha256 = "cbed8667cff6dede6ceac5127bc713b30b700c480fd1405028bd0493f424cea9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/monad-par-extras.nix b/pkgs/monad-par-extras.nix
deleted file mode 100644
index 86e652cbb7729c366cecf0653ec493e863d18985..0000000000000000000000000000000000000000
--- a/pkgs/monad-par-extras.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, abstract-par, base, cereal, deepseq, lib, mtl
-, random, transformers
-}:
-mkDerivation {
-  pname = "monad-par-extras";
-  version = "0.3.3";
-  sha256 = "e21e33190bc248afa4ae467287ac37d24037ef3de6050c44fd85b52f4d5b842e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    abstract-par base cereal deepseq mtl random transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/simonmar/monad-par";
-  description = "Combinators and extra features for Par monads";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monad-par.nix b/pkgs/monad-par.nix
deleted file mode 100644
index 9d7fb61bbc5ad331f3a4bdb26f20a285a6c722b9..0000000000000000000000000000000000000000
--- a/pkgs/monad-par.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, abstract-deque, abstract-par
-, array, base, containers, deepseq, fetchgit, lib, monad-par-extras
-, mtl, mwc-random, parallel, test-framework, test-framework-hunit
-, test-framework-quickcheck2, test-framework-th, time
-}:
-mkDerivation {
-  pname = "monad-par";
-  version = "0.3.5";
-  src = fetchgit {
-    url = "https://github.com/locallycompact/monad-par";
-    sha256 = "0907kpzgvmv98pbn8pvbgccwkgx3fv5lypjlr3xlqp6ghy0yprym";
-    rev = "4f5b44fc85095e08cc159e4fc54a7d78dc41eccf";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/monad-par/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    abstract-deque abstract-par array base containers deepseq
-    monad-par-extras mtl mwc-random parallel
-  ];
-  testHaskellDepends = [
-    abstract-deque abstract-par array base containers deepseq HUnit
-    monad-par-extras mtl mwc-random QuickCheck test-framework
-    test-framework-hunit test-framework-quickcheck2 test-framework-th
-    time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/simonmar/monad-par";
-  description = "A library for parallel programming based on a monad";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monad-parallel.nix b/pkgs/monad-parallel.nix
deleted file mode 100644
index 01bccbf8e42dbb3cf376b669b4139a50ad6f71b5..0000000000000000000000000000000000000000
--- a/pkgs/monad-parallel.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, lib, parallel, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "monad-parallel";
-  version = "0.8";
-  sha256 = "44658c1d4036a390a6c6597866e212f73c058ac3b369b8763e0f10c2382b20c9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base parallel transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://hub.darcs.net/blamario/SCC.wiki/";
-  description = "Parallel execution of monadic computations";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monad-peel.nix b/pkgs/monad-peel.nix
deleted file mode 100644
index 1a5ff7c7a2abeb909a1453c7692aff09a9fe4d6d..0000000000000000000000000000000000000000
--- a/pkgs/monad-peel.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, HUnit, base, extensible-exceptions, lib
-, test-framework, test-framework-hunit, transformers
-}:
-mkDerivation {
-  pname = "monad-peel";
-  version = "0.2.1.2";
-  sha256 = "2dd5e9090f3951dbc298e35c3cea7099818aba0485a55059475c4f346fc933f4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base extensible-exceptions transformers
-  ];
-  testHaskellDepends = [
-    base extensible-exceptions HUnit test-framework
-    test-framework-hunit transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://andersk.mit.edu/haskell/monad-peel/";
-  description = "Lift control operations like exception catching through monad transformers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monads-tf.nix b/pkgs/monads-tf.nix
index 336a9cd2a5e33f8305bebc5353c1b37476581a48..69ada2fdceb65669d52c784ddfae406f8a347252 100644
--- a/pkgs/monads-tf.nix
+++ b/pkgs/monads-tf.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, transformers }:
 mkDerivation {
   pname = "monads-tf";
-  version = "0.1.0.3";
-  sha256 = "249dd2aa55c4dd6530f1e49f6b052ec91bc590ecfef2bd24c58837a3f8d4b0f1";
+  version = "0.3.0.1";
+  sha256 = "21bcd293bf663b6cf993600a3357da724e09c088bdb0ba792f7afc8b69fa5f02";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,6 +14,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
+  homepage = "https://github.com/typeclasses/monads-tf";
   description = "Monad classes, using type families";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/mono-traversable.nix b/pkgs/mono-traversable.nix
deleted file mode 100644
index 57cd0d2833a5f18d8d9a6a52ab3f1c3ba21a37f1..0000000000000000000000000000000000000000
--- a/pkgs/mono-traversable.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, containers
-, foldl, gauge, hashable, hspec, lib, mwc-random, split, text
-, transformers, unordered-containers, vector, vector-algorithms
-}:
-mkDerivation {
-  pname = "mono-traversable";
-  version = "1.0.15.3";
-  sha256 = "98b220f3313d74227a4249210c8818e839678343e62b3ebb1b8c867cf2b974b7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers hashable split text transformers
-    unordered-containers vector vector-algorithms
-  ];
-  testHaskellDepends = [
-    base bytestring containers foldl hspec HUnit QuickCheck text
-    transformers unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [ base gauge mwc-random vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/mono-traversable#readme";
-  description = "Type classes for mapping, folding, and traversing monomorphic containers";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/monoid-extras.nix b/pkgs/monoid-extras.nix
index afeef729d56896a4b0c785c4fc9278e863da8864..0f77a6d44d5a878fa823a776a56e7b6695aeb713 100644
--- a/pkgs/monoid-extras.nix
+++ b/pkgs/monoid-extras.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "monoid-extras";
   version = "0.6.2";
   sha256 = "9ceec9125e4727c40bb1622319fb77f2d2fac39735f533afdb7f33e118b85de1";
-  revision = "1";
-  editedCabalFile = "1xl89p6qcir69qg0kn4443swl4kcgl3vm8dbfi86dgr5z6zvpxhc";
+  revision = "2";
+  editedCabalFile = "08ydfb0n886qzy940lfvyv1pcj51yhpa0kz6pwn7lm22fh1hb5pf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/monoid-subclasses.nix b/pkgs/monoid-subclasses.nix
index 26cc083434c851b46b26c758d6bef57eee6015f6..61085d5c82856ba2223f866caa5a7dc5c1f65d6f 100644
--- a/pkgs/monoid-subclasses.nix
+++ b/pkgs/monoid-subclasses.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "monoid-subclasses";
-  version = "1.2.3";
-  sha256 = "fec14348bab9cb26768de7b9092489fe040d7001603ab1f461910fce4f52d0dd";
+  version = "1.2.4.1";
+  sha256 = "b2f113aad8c687c64e24200984d4002165244e504df90afe4730badee557ed4a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/monoidal-containers.nix b/pkgs/monoidal-containers.nix
deleted file mode 100644
index 2720e18dc2acd33f6c889c1a125a19e4f556b788..0000000000000000000000000000000000000000
--- a/pkgs/monoidal-containers.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, aeson, base, containers, deepseq, fetchgit
-, hashable, lens, lib, newtype, semialign, these
-, unordered-containers, witherable
-}:
-mkDerivation {
-  pname = "monoidal-containers";
-  version = "0.6.3.0";
-  src = fetchgit {
-    url = "https://github.com/locallycompact/monoidal-containers";
-    sha256 = "19093cl6v8wlpmmxmk2s88pr0fz51pvhbci4i42frnlfxgqaw0b1";
-    rev = "977140aed7f850ca4e73090475b0f7ff02a7a92e";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base containers deepseq hashable lens newtype semialign these
-    unordered-containers witherable
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/bgamari/monoidal-containers";
-  description = "Containers with monoidal accumulation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mwc-random.nix b/pkgs/mwc-random.nix
deleted file mode 100644
index b061cf22c2fb6bcb9687623425eae9a8138f7d35..0000000000000000000000000000000000000000
--- a/pkgs/mwc-random.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, doctest, gauge, lib
-, math-functions, mersenne-random, primitive, random, tasty
-, tasty-hunit, tasty-quickcheck, time, vector
-}:
-mkDerivation {
-  pname = "mwc-random";
-  version = "0.15.0.2";
-  sha256 = "35d64d5d6f8e93321d36952cf9ab64e21a9cad642ba39aa7378d88aa08afc25b";
-  revision = "1";
-  editedCabalFile = "15q5pax8708shpmmf2ql6ximsidzmfsrqkf4ix3dljz65jvhz7hh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base math-functions primitive random time vector
-  ];
-  testHaskellDepends = [
-    base bytestring doctest primitive QuickCheck random tasty
-    tasty-hunit tasty-quickcheck vector
-  ];
-  benchmarkHaskellDepends = [
-    base gauge mersenne-random random vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/bos/mwc-random";
-  description = "Fast, high quality pseudo random number generation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/nanospec.nix b/pkgs/nanospec.nix
deleted file mode 100644
index 80f133262a5f15b9345c68ab462537ab5fa213d1..0000000000000000000000000000000000000000
--- a/pkgs/nanospec.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, hspec, lib, silently }:
-mkDerivation {
-  pname = "nanospec";
-  version = "0.2.2";
-  sha256 = "cf14ccc2b296c910000cdc3eb51b37389b3eb94139384b9555db79b8128595e5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base hspec silently ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/nanospec#readme";
-  description = "A lightweight implementation of a subset of Hspec's API";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/nats.nix b/pkgs/nats.nix
deleted file mode 100644
index a85f59f4f14b07810bf231933f6f0c0793a4f36b..0000000000000000000000000000000000000000
--- a/pkgs/nats.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, lib }:
-mkDerivation {
-  pname = "nats";
-  version = "1.1.2";
-  sha256 = "b9d2d85d8612f9b06f8c9bfd1acecd848e03ab82cfb53afe1d93f5086b6e80ec";
-  revision = "4";
-  editedCabalFile = "0qccypqkfs7hi0v2bsjfqfhpi2jgsnpfwi9vmcqh7jxk5g08njk0";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/nats/";
-  description = "Natural numbers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/natural-arithmetic.nix b/pkgs/natural-arithmetic.nix
index 9e1fafbac3479c312bc7800cb0393735584bf132..9e9b2153e1b2775ca76865391db76c59811e2abc 100644
--- a/pkgs/natural-arithmetic.nix
+++ b/pkgs/natural-arithmetic.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "natural-arithmetic";
-  version = "0.1.3.0";
-  sha256 = "aa13f2e8671d6bf9d21c7e62cf5f0b0ee94785f0c6249b8b97abd0b9dd8f308e";
+  version = "0.1.4.0";
+  sha256 = "c4ff0cd6c39f2ca4e4f5e5ef6b9e076eedfe629ffdee85501f9aa792254b8289";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/natural-transformation.nix b/pkgs/natural-transformation.nix
index 926d5a9d6f6ef7384f66e7f328467a842cff1f4c..14e81f86c18dba2a3781d56b56a267ead33f4711 100644
--- a/pkgs/natural-transformation.nix
+++ b/pkgs/natural-transformation.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "natural-transformation";
   version = "0.4";
   sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af";
-  revision = "10";
-  editedCabalFile = "18d14fasp1l5xdfgp8swgcyyjd3irqj19cn298ksx9wiw43j818p";
+  revision = "12";
+  editedCabalFile = "0nlyhp29s2c93d1rflrw4wkzpp98i9zr11fca2vd6z31yc7dg5pg";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/neat-interpolation.nix b/pkgs/neat-interpolation.nix
index fceefd8607ae6b99dd938d9a25915f8422324f8c..a699ec53eb8070b6d950ee6d7c7f51c5795f0bf3 100644
--- a/pkgs/neat-interpolation.nix
+++ b/pkgs/neat-interpolation.nix
@@ -1,19 +1,15 @@
-{ mkDerivation, QuickCheck, base, lib, megaparsec
-, quickcheck-instances, rerebase, tasty, tasty-hunit
-, tasty-quickcheck, template-haskell, text
+{ mkDerivation, base, lib, megaparsec, rerebase, tasty, tasty-hunit
+, template-haskell, text
 }:
 mkDerivation {
   pname = "neat-interpolation";
-  version = "0.5.1.3";
-  sha256 = "1fab6182a280d48ffffccb7fbe09c4f5bf67f4b29df5d6651d813f1336636507";
+  version = "0.5.1.4";
+  sha256 = "8eb733e3b1d90d87e0cff8b648f4b8145e38afd558f2c8343029770c9f023ab7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base megaparsec template-haskell text ];
-  testHaskellDepends = [
-    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-    tasty-quickcheck
-  ];
+  testHaskellDepends = [ rerebase tasty tasty-hunit ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -22,7 +18,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/nikita-volkov/neat-interpolation";
-  description = "A quasiquoter for neat and simple multiline text interpolation";
+  description = "Quasiquoter for neat and simple multiline text interpolation";
   license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/net-mqtt.nix b/pkgs/net-mqtt.nix
index 94e1780f8992e9a12f46272cb04e8e5395a3df07..e06d6906bb56b2606a94a682d5b135b2a4331575 100644
--- a/pkgs/net-mqtt.nix
+++ b/pkgs/net-mqtt.nix
@@ -1,32 +1,36 @@
 { mkDerivation, HUnit, QuickCheck, async, attoparsec
 , attoparsec-binary, base, binary, bytestring, checkers, conduit
-, conduit-extra, connection, containers, deepseq, lib
-, network-conduit-tls, network-uri, optparse-applicative, stm
-, tasty, tasty-hunit, tasty-quickcheck, text, websockets
+, conduit-extra, containers, crypton-connection, deepseq, lens, lib
+, monad-loops, mtl, network-conduit-tls, network-uri
+, optparse-applicative, stm, tasty, tasty-discover, tasty-hunit
+, tasty-quickcheck, text, time, websockets
 }:
 mkDerivation {
   pname = "net-mqtt";
-  version = "0.8.2.5";
-  sha256 = "3d41045cbc9b1adbaccab90ee9a4bc3e751fb41d50ea2fa65f7024231f7cde4c";
+  version = "0.8.6.0";
+  sha256 = "e222d84487475fd529dce30a19652891f8ff41c0e85f18a3b5a10bf048a7dcdd";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     async attoparsec attoparsec-binary base binary bytestring conduit
-    conduit-extra connection containers deepseq network-conduit-tls
-    network-uri QuickCheck stm text websockets
+    conduit-extra containers crypton-connection deepseq monad-loops
+    network-conduit-tls network-uri QuickCheck stm text time websockets
   ];
   executableHaskellDepends = [
     async attoparsec attoparsec-binary base binary bytestring conduit
-    conduit-extra connection containers deepseq network-conduit-tls
-    network-uri optparse-applicative QuickCheck stm text websockets
+    conduit-extra containers crypton-connection deepseq monad-loops
+    network-conduit-tls network-uri optparse-applicative QuickCheck stm
+    text time websockets
   ];
   testHaskellDepends = [
     async attoparsec attoparsec-binary base binary bytestring checkers
-    conduit conduit-extra connection containers deepseq HUnit
-    network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit
-    tasty-quickcheck text websockets
+    conduit conduit-extra containers crypton-connection deepseq HUnit
+    lens monad-loops mtl network-conduit-tls network-uri QuickCheck stm
+    tasty tasty-discover tasty-hunit tasty-quickcheck text time
+    websockets
   ];
+  testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/network-bsd.nix b/pkgs/network-bsd.nix
deleted file mode 100644
index df9dc41b412138dfe3baecf00db718d246520211..0000000000000000000000000000000000000000
--- a/pkgs/network-bsd.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, deepseq, lib, network }:
-mkDerivation {
-  pname = "network-bsd";
-  version = "2.8.1.0";
-  sha256 = "d94961ca15c42c798d19cde540ec12b25cc43435fb95e682399d6c1a02022d4e";
-  revision = "4";
-  editedCabalFile = "1gd9a8j7fwg0jz0s6il5fk9sl0hm19ja1w56ix51wa0qi2h5x56d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq network ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/network-bsd";
-  description = "POSIX network database (<netdb.h>) API";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/network-byte-order.nix b/pkgs/network-byte-order.nix
deleted file mode 100644
index 6e0a643783754edc414313d6067b564485ffc5eb..0000000000000000000000000000000000000000
--- a/pkgs/network-byte-order.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, bytestring, doctest, lib }:
-mkDerivation {
-  pname = "network-byte-order";
-  version = "0.1.6";
-  sha256 = "f2b0ccc9b759d686af30aac874fc394c13c1fc8a3db00fac401c9339c263dc5e";
-  revision = "1";
-  editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [ base bytestring doctest ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Network byte order utilities";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/network-conduit-tls.nix b/pkgs/network-conduit-tls.nix
index 040c78d4253573c84db6261885cd0cce752b4c1f..bcd59a924f8e0c7bc7311311d285ccf089af5a59 100644
--- a/pkgs/network-conduit-tls.nix
+++ b/pkgs/network-conduit-tls.nix
@@ -1,20 +1,21 @@
 { mkDerivation, HUnit, base, bytestring, conduit, conduit-extra
-, connection, data-default-class, lib, mtl, network
+, crypton-connection, data-default-class, lib, mtl, network
 , streaming-commons, tls, transformers, unliftio-core
 }:
 mkDerivation {
   pname = "network-conduit-tls";
-  version = "1.3.2";
-  sha256 = "ecfd60e162de3993a71906293dcf2ec8bd4c794471eb8dca13746c1d8fd3ad7f";
+  version = "1.4.0";
+  sha256 = "c5157a743239d959b38bb478df9db3bf2cc5a6b3460d7a95967eebe7a26c4d99";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring conduit conduit-extra connection data-default-class
-    network streaming-commons tls transformers unliftio-core
+    base bytestring conduit conduit-extra crypton-connection
+    data-default-class network streaming-commons tls transformers
+    unliftio-core
   ];
   testHaskellDepends = [
-    base bytestring conduit conduit-extra connection HUnit mtl
+    base bytestring conduit conduit-extra crypton-connection HUnit mtl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/network-run.nix b/pkgs/network-run.nix
deleted file mode 100644
index ad56dde30496d762ca9f27cecc465ea6f502ad50..0000000000000000000000000000000000000000
--- a/pkgs/network-run.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, lib, network }:
-mkDerivation {
-  pname = "network-run";
-  version = "0.2.4";
-  sha256 = "f415c619eeb34a18493dfcd634049c7a1da1b02615e1387b0096c80126af6d70";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring network ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Simple network runner library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/network-uri.nix b/pkgs/network-uri.nix
deleted file mode 100644
index 3c11bb419ecb415d2528d9ed3b8915f38f08a245..0000000000000000000000000000000000000000
--- a/pkgs/network-uri.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, criterion, deepseq, lib
-, parsec, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-, th-compat
-}:
-mkDerivation {
-  pname = "network-uri";
-  version = "2.6.4.2";
-  sha256 = "9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq parsec template-haskell th-compat
-  ];
-  testHaskellDepends = [
-    base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [ base criterion deepseq HUnit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/network-uri";
-  description = "URI manipulation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/network.nix b/pkgs/network.nix
deleted file mode 100644
index ae73b3d588a22a5cbfa0b71b325b5557eb57096f..0000000000000000000000000000000000000000
--- a/pkgs/network.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, deepseq
-, directory, hspec, hspec-discover, lib, temporary
-}:
-mkDerivation {
-  pname = "network";
-  version = "3.1.2.9";
-  sha256 = "0cbf95e4653dbfecc3907e10e7e7bbddb9dd673f172848a0ff3131ab3efdd900";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring deepseq directory ];
-  testHaskellDepends = [
-    base bytestring directory hspec HUnit QuickCheck temporary
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/network";
-  description = "Low-level networking interface";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/nonempty-vector.nix b/pkgs/nonempty-vector.nix
index 84b91e81ad57c96576145fb0685dc11add5b09cc..a67b8b2183451aff0e3d588fe2dd6f464109d8b6 100644
--- a/pkgs/nonempty-vector.nix
+++ b/pkgs/nonempty-vector.nix
@@ -3,8 +3,10 @@
 }:
 mkDerivation {
   pname = "nonempty-vector";
-  version = "0.2.2.0";
-  sha256 = "6fc72cf173486d76e2f9e2bfc5749ed07e070fc26807594906124d99cac5db59";
+  version = "0.2.3";
+  sha256 = "0a3702141421076416928f73d3ee6c66a920533ad02a9a771bc0bfc404d7aca3";
+  revision = "1";
+  editedCabalFile = "0kn1s5ssan9m4xwf10y2ymba4zw2j18j6dvbpr6iral3rrlgngdw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/nothunks.nix b/pkgs/nothunks.nix
deleted file mode 100644
index 67d7815c96854d02bfde5cf8dd294ccedbe68cd2..0000000000000000000000000000000000000000
--- a/pkgs/nothunks.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim
-, hedgehog, lib, random, stm, tasty, tasty-hedgehog, text, time
-, vector
-}:
-mkDerivation {
-  pname = "nothunks";
-  version = "0.1.4";
-  sha256 = "888a02eb74d70b39372421020420924cf746afcffd370b99535ada562faa1375";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers ghc-heap stm text time vector
-  ];
-  testHaskellDepends = [
-    base containers ghc-prim hedgehog random stm tasty tasty-hedgehog
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Examine values for unexpected thunks";
-  license = lib.licenses.asl20;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/numeric-prelude.nix b/pkgs/numeric-prelude.nix
index b209167a66dcfacadc575a71d919325042840fad..99e3ca489ed84c346756287ffa2d51d598b59ccb 100644
--- a/pkgs/numeric-prelude.nix
+++ b/pkgs/numeric-prelude.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "numeric-prelude";
   version = "0.4.4";
   sha256 = "5a32f6b4dab913c68db30acc2e70e41e4b8f9fb00d25407ed4b0e4ae85cfa613";
+  revision = "1";
+  editedCabalFile = "0w5an2w06vpi75qj9972qbsiz4n72mr6mkib4ivlrrirndsyda79";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/old-locale.nix b/pkgs/old-locale.nix
deleted file mode 100644
index a1d4b9bd04e5380b3dac7bc24ff08048b72ee131..0000000000000000000000000000000000000000
--- a/pkgs/old-locale.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "old-locale";
-  version = "1.0.0.7";
-  sha256 = "dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50";
-  revision = "2";
-  editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "locale library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/old-time.nix b/pkgs/old-time.nix
deleted file mode 100644
index 2e20187616283df2e5a015e0009a69c5aa2fa3ec..0000000000000000000000000000000000000000
--- a/pkgs/old-time.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib, old-locale }:
-mkDerivation {
-  pname = "old-time";
-  version = "1.1.0.3";
-  sha256 = "1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1";
-  revision = "2";
-  editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base old-locale ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Time library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/openapi3.nix b/pkgs/openapi3.nix
index c1b39a49b0e91e41c5f0cda8a70b896e4283160f..fa8b0a88eefba9a17dd50fdacd2130911608fe69 100644
--- a/pkgs/openapi3.nix
+++ b/pkgs/openapi3.nix
@@ -10,8 +10,8 @@ mkDerivation {
   pname = "openapi3";
   version = "3.2.3";
   sha256 = "d4e4570955bcc66fde72c3070bc3ef4bcf54b82ef71448f6541256d79dfa736b";
-  revision = "3";
-  editedCabalFile = "1cp12nvndc2hpgjxv2j8p0nhrii9hawjsgph6yrcg88ckihy7zaz";
+  revision = "4";
+  editedCabalFile = "1wpdmp3xp948052y325h64smp6l809r8mcvh220bfbrb4vrbk43b";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/openssl-streams.nix b/pkgs/openssl-streams.nix
index 1a6b1b3c0562056407b431560d65509be5008a16..6772500d9aa47db6ed62af0d13b327b93a834b32 100644
--- a/pkgs/openssl-streams.nix
+++ b/pkgs/openssl-streams.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "openssl-streams";
   version = "1.2.3.0";
   sha256 = "55f20bd8970e5ce4d0ff16fae8c584c63e26e0990d27364340b997f5feb5f682";
-  revision = "1";
-  editedCabalFile = "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp";
+  revision = "2";
+  editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/optics-core.nix b/pkgs/optics-core.nix
index de60b096407d78f468e111eff1b3da8aa9b4978c..f3d6961268d6a05dd675559e3dde2b21d7248c4e 100644
--- a/pkgs/optics-core.nix
+++ b/pkgs/optics-core.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "optics-core";
-  version = "0.4.1";
-  sha256 = "ca64e215f31719482a9449b5d56fbd589367e639d2b1869f7965a3970442949a";
-  revision = "1";
-  editedCabalFile = "0sqwlbl6x0197bpkq7jvn9j5iwyr54z8qwmxbij6qlwjyfld2qxi";
+  version = "0.4.1.1";
+  sha256 = "3e817e3c66a0120ac4b4b6d790e659b75f8c0fb27c5f65f3974f4c697b7bb3fb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/optics-th.nix b/pkgs/optics-th.nix
index 08bf7c2a6a9184637731e7f4d2ffe6dc093e1158..2cfb3836b928dac8ade48d491b74729eaa9f554c 100644
--- a/pkgs/optics-th.nix
+++ b/pkgs/optics-th.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "optics-th";
   version = "0.4.1";
   sha256 = "d73857b79dcd8f7c7e70fa4727f134145b62902e8d3e448f8b25c38a9da4fd17";
-  revision = "4";
-  editedCabalFile = "0l9kafjxrqnkqqb2mdwc6rjhhyp7j5mabaxzmgq6fzl8cr9qbjfk";
+  revision = "5";
+  editedCabalFile = "0a9h1bll1m9v40cv7ifv2sy3k6sfcq325s7cpk33wh65awf5zpl7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/optics.nix b/pkgs/optics.nix
index 35cea72775dc98a5a1d87dff5d77ed00a60188b4..46fd083e78886f0a1e8a1a06910fa28d2d079380 100644
--- a/pkgs/optics.nix
+++ b/pkgs/optics.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "optics";
-  version = "0.4.2";
-  sha256 = "ebe7553704d3491f02777dc6f02a2cf170d4b87ce5265139ce759314460533c7";
+  version = "0.4.2.1";
+  sha256 = "e653d86aba75454fac21ab2f4220e895ad7f6e06889bc08d3f6522de4f7c5f6b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/optional-args.nix b/pkgs/optional-args.nix
deleted file mode 100644
index 280d2ba5bedec13d30a3ef1d2df1e160c6bbfe8e..0000000000000000000000000000000000000000
--- a/pkgs/optional-args.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "optional-args";
-  version = "1.0.2";
-  sha256 = "2e3454ad77cba80b15c02dbe1915889fafa81a22deb7fe5e7e01b0dd8d85b0e4";
-  revision = "2";
-  editedCabalFile = "1f3j092lk2qa6hi2p4iciyyxg27mzm37dlcw5hg3ch2wh6jw0a37";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Optional function arguments";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/options.nix b/pkgs/options.nix
index 6d979891f3e63e2b3f77fd5dfa2e5ce216f95baf..33bc53065505eadd9fb5bf6529342e7c040fafb7 100644
--- a/pkgs/options.nix
+++ b/pkgs/options.nix
@@ -1,17 +1,14 @@
-{ mkDerivation, base, chell, chell-quickcheck, containers, lib
-, monads-tf, transformers
+{ mkDerivation, base, containers, hspec, lib, monads-tf, patience
 }:
 mkDerivation {
   pname = "options";
-  version = "1.2.1.1";
-  sha256 = "283eea9ae2c539830c6c65f5c03fb00626cfd1274da0526c285c146fc3065a62";
+  version = "1.2.1.2";
+  sha256 = "6e4d8fa177713d00f95cb43d21359a7d2908ce1e04f703be5b59679ccc3a5f4a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers monads-tf transformers ];
-  testHaskellDepends = [
-    base chell chell-quickcheck containers monads-tf transformers
-  ];
+  libraryHaskellDepends = [ base containers monads-tf ];
+  testHaskellDepends = [ base containers hspec monads-tf patience ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -19,8 +16,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://john-millikin.com/software/haskell-options/";
-  description = "A powerful and easy-to-use command-line option parser";
+  homepage = "https://github.com/typeclasses/options/";
+  description = "Powerful and easy command-line option parser";
   license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/optparse-applicative.nix b/pkgs/optparse-applicative.nix
deleted file mode 100644
index e17931576c843d215627c90cb6d21c8747515435..0000000000000000000000000000000000000000
--- a/pkgs/optparse-applicative.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, ansi-wl-pprint, base, lib, process
-, transformers, transformers-compat
-}:
-mkDerivation {
-  pname = "optparse-applicative";
-  version = "0.17.0.0";
-  sha256 = "825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-wl-pprint base process transformers transformers-compat
-  ];
-  testHaskellDepends = [ base QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/pcapriotti/optparse-applicative";
-  description = "Utilities and combinators for parsing command line options";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/optparse-generic.nix b/pkgs/optparse-generic.nix
index 497753bbd2d339678b3b132ebdb9788cb5337dd0..4fa625b866dee3ba174080c04fe4851e7a23a36a 100644
--- a/pkgs/optparse-generic.nix
+++ b/pkgs/optparse-generic.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "optparse-generic";
-  version = "1.5.0";
-  sha256 = "a566b590218e665725c4de6702cce92670acd14f6debd8e25b1223a76c2ab079";
+  version = "1.5.1";
+  sha256 = "d9db0fd22d84973fb31ed7a52162686fbb9f4efbb8e4525cd39a77bf208bca06";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/pandoc-types.nix b/pkgs/pandoc-types.nix
index f0c70d49f82f9f687b4c94d3fa9b77452bdcb610..d268135b8747019f8aeb1781abc3fbaa8b5281ed 100644
--- a/pkgs/pandoc-types.nix
+++ b/pkgs/pandoc-types.nix
@@ -1,12 +1,12 @@
 { mkDerivation, HUnit, QuickCheck, aeson, base, bytestring
-, containers, criterion, deepseq, ghc-prim, lib, string-qq, syb
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text, transformers
+, containers, criterion, deepseq, ghc-prim, lib, syb
+, template-haskell, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, transformers
 }:
 mkDerivation {
   pname = "pandoc-types";
-  version = "1.23";
-  sha256 = "5e6721410219c0a39b05fc732de9864745592fffa8287ad6e87c66138a51162d";
+  version = "1.23.1";
+  sha256 = "ad0fa083d28d452b7d37a1c67a2c140137a5f29a2f52fd88e807fac20245a1c1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,8 +15,9 @@ mkDerivation {
     text transformers
   ];
   testHaskellDepends = [
-    aeson base bytestring containers HUnit QuickCheck string-qq syb
-    test-framework test-framework-hunit test-framework-quickcheck2 text
+    aeson base bytestring containers HUnit QuickCheck syb
+    template-haskell test-framework test-framework-hunit
+    test-framework-quickcheck2 text
   ];
   benchmarkHaskellDepends = [ base criterion text ];
   enableLibraryProfiling = true;
diff --git a/pkgs/pandoc.nix b/pkgs/pandoc.nix
index 4ace927d8d0cc63a05417242db18c449482da32c..7196e57b9ba2c472c5d0ef7de7f0bd8529c9547c 100644
--- a/pkgs/pandoc.nix
+++ b/pkgs/pandoc.nix
@@ -1,22 +1,23 @@
 { mkDerivation, Diff, Glob, JuicyPixels, SHA, aeson, aeson-pretty
 , array, attoparsec, base, base64, binary, blaze-html, blaze-markup
 , bytestring, case-insensitive, citeproc, commonmark
-, commonmark-extensions, commonmark-pandoc, connection, containers
-, data-default, deepseq, directory, doclayout, doctemplates, emojis
-, exceptions, file-embed, filepath, gridtables, haddock-library
-, http-client, http-client-tls, http-types, ipynb, jira-wiki-markup
-, lib, mime-types, mtl, network, network-uri, pandoc-types, parsec
-, pretty, pretty-show, process, random, safe, scientific
-, skylighting, skylighting-core, split, syb, tagsoup, tasty
-, tasty-bench, tasty-golden, tasty-hunit, tasty-quickcheck
-, temporary, texmath, text, text-conversions, time
-, unicode-collation, unicode-transforms, unix, xml, xml-conduit
-, xml-types, yaml, zip-archive, zlib
+, commonmark-extensions, commonmark-pandoc, containers
+, crypton-connection, data-default, deepseq, directory, doclayout
+, doctemplates, emojis, exceptions, file-embed, filepath
+, gridtables, haddock-library, http-client, http-client-tls
+, http-types, ipynb, jira-wiki-markup, lib, mime-types, mtl
+, network, network-uri, pandoc-types, parsec, pretty, pretty-show
+, process, random, safe, scientific, skylighting, skylighting-core
+, split, syb, tagsoup, tasty, tasty-bench, tasty-golden
+, tasty-hunit, tasty-quickcheck, temporary, texmath, text
+, text-conversions, time, typst, unicode-collation
+, unicode-transforms, unix, vector, xml, xml-conduit, xml-types
+, yaml, zip-archive, zlib
 }:
 mkDerivation {
   pname = "pandoc";
-  version = "3.1.2";
-  sha256 = "b682d21b46ea969cfac0f72d1739d9b4595875638f5d9b86a55edc2d916e1cec";
+  version = "3.1.9";
+  sha256 = "8a69439793e549a928f83b38e95200a993a53cc961e6d128d465e4576f17861a";
   configureFlags = [ "-f-trypandoc" ];
   isLibrary = true;
   isExecutable = false;
@@ -24,20 +25,21 @@ mkDerivation {
   libraryHaskellDepends = [
     aeson aeson-pretty array attoparsec base base64 binary blaze-html
     blaze-markup bytestring case-insensitive citeproc commonmark
-    commonmark-extensions commonmark-pandoc connection containers
-    data-default deepseq directory doclayout doctemplates emojis
-    exceptions file-embed filepath Glob gridtables haddock-library
-    http-client http-client-tls http-types ipynb jira-wiki-markup
-    JuicyPixels mime-types mtl network network-uri pandoc-types parsec
-    pretty pretty-show process random safe scientific SHA skylighting
-    skylighting-core split syb tagsoup temporary texmath text
-    text-conversions time unicode-collation unicode-transforms unix xml
-    xml-conduit xml-types yaml zip-archive zlib
+    commonmark-extensions commonmark-pandoc containers
+    crypton-connection data-default deepseq directory doclayout
+    doctemplates emojis exceptions file-embed filepath Glob gridtables
+    haddock-library http-client http-client-tls http-types ipynb
+    jira-wiki-markup JuicyPixels mime-types mtl network network-uri
+    pandoc-types parsec pretty pretty-show process random safe
+    scientific SHA skylighting skylighting-core split syb tagsoup
+    temporary texmath text text-conversions time typst
+    unicode-collation unicode-transforms unix vector xml xml-conduit
+    xml-types yaml zip-archive zlib
   ];
   testHaskellDepends = [
     base bytestring containers Diff directory doctemplates filepath
     Glob mtl pandoc-types process tasty tasty-golden tasty-hunit
-    tasty-quickcheck text time xml zip-archive
+    tasty-quickcheck temporary text time xml zip-archive
   ];
   benchmarkHaskellDepends = [
     base bytestring deepseq mtl tasty-bench text
diff --git a/pkgs/parallel.nix b/pkgs/parallel.nix
deleted file mode 100644
index 8d223f9da5d109989cc958fc0a6c78a53aa225cd..0000000000000000000000000000000000000000
--- a/pkgs/parallel.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, array, base, containers, deepseq, ghc-prim, lib }:
-mkDerivation {
-  pname = "parallel";
-  version = "3.2.2.0";
-  sha256 = "170453a71a2a8b31cca63125533f7771d7debeb639700bdabdd779c34d8a6ef6";
-  revision = "6";
-  editedCabalFile = "1f14frciafrs63a581lm7s1zxv71wa04ydzf80gldfi7x73c6ln6";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Parallel programming library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/parsec-class.nix b/pkgs/parsec-class.nix
deleted file mode 100644
index 82eb5e6726535b8d3079b137fa6fa4259ba25cbe..0000000000000000000000000000000000000000
--- a/pkgs/parsec-class.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, parsec }:
-mkDerivation {
-  pname = "parsec-class";
-  version = "1.0.0.0";
-  sha256 = "029c4ec5e6b0efd0505f1051c29c02060ddab3018b9aef4c4ae96a99f58e1773";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base parsec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/peti/parsec-class";
-  description = "Class of types that can be constructed from their text representation";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/parsec.nix b/pkgs/parsec.nix
deleted file mode 100644
index 63c6864cf56e6e8f631188856cd89049ae8a771d..0000000000000000000000000000000000000000
--- a/pkgs/parsec.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, bytestring, lib, mtl, tasty, tasty-hunit
-, text
-}:
-mkDerivation {
-  pname = "parsec";
-  version = "3.1.16.1";
-  sha256 = "a41962e5d76ea68658876735b8d5b755e0eff336b079d0a2f439c364755d1246";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring mtl text ];
-  testHaskellDepends = [ base mtl tasty tasty-hunit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/parsec";
-  description = "Monadic parser combinators";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/parser-combinators.nix b/pkgs/parser-combinators.nix
index a08780229786c98e25cbaf40f1569ff03458ea88..ae187898a86f5925e76566de418f532409f86e2b 100644
--- a/pkgs/parser-combinators.nix
+++ b/pkgs/parser-combinators.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "parser-combinators";
   version = "1.3.0";
   sha256 = "9310ef0d49f8a8922acda10b1cded9854cbee04dea717effc6ee5983072e4447";
+  revision = "1";
+  editedCabalFile = "0xkqxas64dd77lgc341b526rip7vva0ipy2kbczmfga41lz5fnc6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/parsers.nix b/pkgs/parsers.nix
deleted file mode 100644
index 3c0a2c2205bf9af1592cca2cb8d4315a3124f5b3..0000000000000000000000000000000000000000
--- a/pkgs/parsers.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, QuickCheck, attoparsec, base, base-orphans, binary
-, bytestring, charset, containers, lib, mtl, parsec
-, quickcheck-instances, scientific, text, transformers
-, unordered-containers
-}:
-mkDerivation {
-  pname = "parsers";
-  version = "0.12.11";
-  sha256 = "91ff5067208bb9c618b9d41850c3bcdf76865922813937a7047f040daa3b1319";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base base-orphans binary charset containers mtl parsec
-    scientific text transformers unordered-containers
-  ];
-  testHaskellDepends = [
-    attoparsec base bytestring parsec QuickCheck quickcheck-instances
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/parsers/";
-  description = "Parsing combinators";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/password.nix b/pkgs/password.nix
index 2bc2070229e9e9b9d68ef29f482fd83164efd795..50a5c8450a5aef325e07a5e63f2fcfc43f4821b4 100644
--- a/pkgs/password.nix
+++ b/pkgs/password.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "password";
   version = "3.0.2.1";
   sha256 = "e935fcab166fae63e1fc02155d12e61881d1daac8edfca9f125ea7f44aa2d60d";
+  revision = "1";
+  editedCabalFile = "0a4avz0g6nwr293718h63mpqkxhxsjmmfnyk2wfcfkb4pbm1q0y8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/path-dhall-instance.nix b/pkgs/path-dhall-instance.nix
deleted file mode 100644
index e64161456b49d63bf520f140b200c76bcd670244..0000000000000000000000000000000000000000
--- a/pkgs/path-dhall-instance.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, dhall, either, lib, path, text }:
-mkDerivation {
-  pname = "path-dhall-instance";
-  version = "0.2.1.0";
-  sha256 = "ca582eedb714f50fe4165c52bfd02c339eabcb0104e49ce0ddd1513352fa2f9e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base dhall either path text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "ToDhall and FromDhall instances for Path";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/path-io.nix b/pkgs/path-io.nix
deleted file mode 100644
index a1779bfced1cbc257b9099576271ecbd37856c85..0000000000000000000000000000000000000000
--- a/pkgs/path-io.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, base, containers, directory, dlist, exceptions
-, filepath, hspec, lib, path, temporary, time, transformers
-, unix-compat
-}:
-mkDerivation {
-  pname = "path-io";
-  version = "1.8.1";
-  sha256 = "9ad37f36cdc89402c9979e33ed62810754049bea7f4dd5f4749258e4dcef0ade";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers directory dlist exceptions filepath path temporary
-    time transformers unix-compat
-  ];
-  testHaskellDepends = [
-    base directory exceptions filepath hspec path transformers
-    unix-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mrkkrp/path-io";
-  description = "Interface to ‘directory’ package for users of ‘path’";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/path.nix b/pkgs/path.nix
deleted file mode 100644
index 4e62d49433d25663ba071ae6aa4a258fda277338..0000000000000000000000000000000000000000
--- a/pkgs/path.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, bytestring, deepseq
-, exceptions, filepath, genvalidity, genvalidity-hspec
-, genvalidity-property, hashable, hspec, lib, mtl, template-haskell
-, text, validity
-}:
-mkDerivation {
-  pname = "path";
-  version = "0.9.2";
-  sha256 = "0e64d6307fd8a609a16994b457e88b62360a7d5bf9421c8180b6e3de9bd4bd97";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base deepseq exceptions filepath hashable template-haskell
-    text
-  ];
-  testHaskellDepends = [
-    aeson base bytestring filepath genvalidity genvalidity-hspec
-    genvalidity-property hspec mtl QuickCheck template-haskell validity
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Support for well-typed paths";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/patience.nix b/pkgs/patience.nix
deleted file mode 100644
index 86cd80915473570a8f87eff7c460ba1807561823..0000000000000000000000000000000000000000
--- a/pkgs/patience.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, containers, lib }:
-mkDerivation {
-  pname = "patience";
-  version = "0.3";
-  sha256 = "715cd08c99c0417462cee383c437c2b4384b6abbc87999fd092c8cf8e8192bc4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/chessai/patience";
-  description = "Patience diff and longest increasing subsequence";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pcre-light.nix b/pkgs/pcre-light.nix
deleted file mode 100644
index 1f0bd44b858323848cefc0b17ef5f10ac4d48cd4..0000000000000000000000000000000000000000
--- a/pkgs/pcre-light.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, containers, lib, mtl, pcre
-}:
-mkDerivation {
-  pname = "pcre-light";
-  version = "0.4.1.0";
-  sha256 = "16f6bfaa320bba91cd0c1a502d871c1c7a3a2de2d58dfaa2d90dba6558d51b53";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  librarySystemDepends = [ pcre ];
-  testHaskellDepends = [ base bytestring containers HUnit mtl ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Daniel-Diaz/pcre-light";
-  description = "Portable regex library for Perl 5 compatible regular expressions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pem.nix b/pkgs/pem.nix
deleted file mode 100644
index a1900cfab35e2a2920258ae430f4ae24e13335a4..0000000000000000000000000000000000000000
--- a/pkgs/pem.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, basement, bytestring, lib
-, memory, test-framework, test-framework-hunit
-, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "pem";
-  version = "0.2.4";
-  sha256 = "770c4c1b9cd24b3db7f511f8a48404a0d098999e28573c3743a8a296bb96f8d4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base basement bytestring memory ];
-  testHaskellDepends = [
-    base bytestring HUnit QuickCheck test-framework
-    test-framework-hunit test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-pem";
-  description = "Privacy Enhanced Mail (PEM) format reader and writer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/persistent-postgresql.nix b/pkgs/persistent-postgresql.nix
index cb2ead684fa09e3408292790249086a031f17369..1a7e4c20bc1a45220461ceae779956f4cc8e9b6e 100644
--- a/pkgs/persistent-postgresql.nix
+++ b/pkgs/persistent-postgresql.nix
@@ -9,8 +9,8 @@
 }:
 mkDerivation {
   pname = "persistent-postgresql";
-  version = "2.13.5.2";
-  sha256 = "712892e70e5cc0b470506b938ab41785dfcfee36f382017673de50ebf78c105d";
+  version = "2.13.6.1";
+  sha256 = "901af60342bedeecbf9b9c6053818e0e7b483bef9807ad4c4a645896b1506757";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/persistent-qq.nix b/pkgs/persistent-qq.nix
index 294b118da906c389fc6631adccecb1fffcb32592..e8c75176a972c3d4b62e3fb8556ff443cf8c5ac5 100644
--- a/pkgs/persistent-qq.nix
+++ b/pkgs/persistent-qq.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "persistent-qq";
-  version = "2.12.0.5";
-  sha256 = "306079b7c761827a121dabd2c5bac4ee1cd342b8388f737045ce2b4a3fcb6fd6";
+  version = "2.12.0.6";
+  sha256 = "8d7386b94d883713ef41edc4cb30c99c7ad4c54aed7019feba76e07a563f01fc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/persistent-sqlite.nix b/pkgs/persistent-sqlite.nix
index a4ccd673cdaa0b5f9e14b764fa89980584f7218b..8d12ba012d8f95d81b7832de8c35d25f9c373a8b 100644
--- a/pkgs/persistent-sqlite.nix
+++ b/pkgs/persistent-sqlite.nix
@@ -7,8 +7,8 @@
 }:
 mkDerivation {
   pname = "persistent-sqlite";
-  version = "2.13.1.1";
-  sha256 = "f2da6df242d3fb40fa256c8e6de0fa53d40d1b091ec7a6ded5001552ed07fa28";
+  version = "2.13.2.0";
+  sha256 = "0761de234c2cc5a63b96dc35e9261e719fdbaccd7995b45778611952ab3704ed";
   configureFlags = [ "-fsystemlib" ];
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/persistent.nix b/pkgs/persistent.nix
index e6b98796eb710d7f2d17c28961e33910e80d4f7b..f99372dd186956560411eab89ac06cc12f909e35 100644
--- a/pkgs/persistent.nix
+++ b/pkgs/persistent.nix
@@ -1,7 +1,7 @@
-{ mkDerivation, QuickCheck, aeson, attoparsec, base
-, base64-bytestring, blaze-html, bytestring, conduit, containers
-, criterion, deepseq, fast-logger, file-embed, hspec, http-api-data
-, lib, lift-type, monad-logger, mtl, path-pieces
+{ mkDerivation, QuickCheck, aeson, attoparsec, attoparsec-aeson
+, base, base64-bytestring, blaze-html, bytestring, conduit
+, containers, criterion, deepseq, fast-logger, file-embed, hspec
+, http-api-data, lib, lift-type, monad-logger, mtl, path-pieces
 , quickcheck-instances, resource-pool, resourcet, scientific
 , shakespeare, silently, template-haskell, text, th-lift-instances
 , time, transformers, unliftio, unliftio-core, unordered-containers
@@ -9,17 +9,18 @@
 }:
 mkDerivation {
   pname = "persistent";
-  version = "2.14.5.0";
-  sha256 = "04618a23e71256abaa4aa0b8f1d9577305b2840334cc1fbe3382f190853c46ee";
+  version = "2.14.6.0";
+  sha256 = "6e2b300797060e091624ebd4d1d5b0b3dad200acf7b9bf2bccfb1c538db6e53b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson attoparsec base base64-bytestring blaze-html bytestring
-    conduit containers deepseq fast-logger http-api-data lift-type
-    monad-logger mtl path-pieces resource-pool resourcet scientific
-    silently template-haskell text th-lift-instances time transformers
-    unliftio unliftio-core unordered-containers vault vector
+    aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html
+    bytestring conduit containers deepseq fast-logger http-api-data
+    lift-type monad-logger mtl path-pieces resource-pool resourcet
+    scientific silently template-haskell text th-lift-instances time
+    transformers unliftio unliftio-core unordered-containers vault
+    vector
   ];
   testHaskellDepends = [
     aeson attoparsec base base64-bytestring blaze-html bytestring
diff --git a/pkgs/pg-entity.nix b/pkgs/pg-entity.nix
index 1661d04eb249275d15c1c1bea88bdd6a0d4305f0..ae0dcb89f4a8a4078fbaf3d7f832d37c85d44aa5 100644
--- a/pkgs/pg-entity.nix
+++ b/pkgs/pg-entity.nix
@@ -1,27 +1,25 @@
 { mkDerivation, aeson, base, bytestring, colourista, containers
-, exceptions, hedgehog, lib, monad-control, mtl, optics-core
-, parsec, pg-transact, postgresql-simple
-, postgresql-simple-migration, resource-pool, safe-exceptions
-, tasty, tasty-hunit, template-haskell, text, text-display
-, text-manipulate, time, tmp-postgres, uuid, vector
+, envparse, hedgehog, lib, mtl, optics-core, parsec, pg-transact
+, postgresql-migration, postgresql-simple, resource-pool
+, safe-exceptions, tasty, tasty-hunit, template-haskell, text
+, text-display, text-manipulate, time, uuid, vector
 }:
 mkDerivation {
   pname = "pg-entity";
-  version = "0.0.4.2";
-  sha256 = "3722a6055459b50fb2cbf5b0374dec6e533aab1725ebad87f89ae004596eb565";
+  version = "0.0.4.3";
+  sha256 = "63ff6433eac2abfa835d7c8d07e222bce48e7a86fa44de2642494a816b51b609";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring colourista exceptions monad-control parsec
-    pg-transact postgresql-simple resource-pool safe-exceptions
-    template-haskell text text-display text-manipulate time uuid vector
+    base bytestring colourista parsec pg-transact postgresql-simple
+    resource-pool template-haskell text text-display text-manipulate
+    time uuid vector
   ];
   testHaskellDepends = [
-    aeson base containers hedgehog mtl optics-core pg-transact
-    postgresql-simple postgresql-simple-migration resource-pool
-    safe-exceptions tasty tasty-hunit text time tmp-postgres uuid
-    vector
+    aeson base bytestring containers envparse hedgehog mtl optics-core
+    pg-transact postgresql-migration postgresql-simple resource-pool
+    safe-exceptions tasty tasty-hunit text time uuid vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,7 +28,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://tchoutri.github.io/pg-entity";
+  homepage = "https://hackage.haskell.org/package/pg-entity/src/docs/book/index.html";
   description = "A pleasant PostgreSQL layer";
   license = lib.licenses.mit;
   broken = false;
diff --git a/pkgs/pgp-wordlist.nix b/pkgs/pgp-wordlist.nix
deleted file mode 100644
index 5152725f1652e3e460c261ce66e3310bd6d5d5aa..0000000000000000000000000000000000000000
--- a/pkgs/pgp-wordlist.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, containers, deepseq
-, doctest, lib, tasty, tasty-hunit, tasty-quickcheck, text, vector
-}:
-mkDerivation {
-  pname = "pgp-wordlist";
-  version = "0.1.0.3";
-  sha256 = "ef3b560276981def53abc01cbe3cb4d0bece8eaa8a210ee890729ee500c4e695";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring containers text vector ];
-  testHaskellDepends = [
-    base bytestring deepseq doctest HUnit tasty tasty-hunit
-    tasty-quickcheck text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/quchen/pgp-wordlist";
-  description = "Translate between binary data and a human-readable collection of words";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pointed.nix b/pkgs/pointed.nix
index 0dfc9b1034e6ab25d241ee7def641b9260a3be02..79b5a8a791afee80ef8fde48a310ad0f302d3198 100644
--- a/pkgs/pointed.nix
+++ b/pkgs/pointed.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "pointed";
   version = "5.0.4";
   sha256 = "a3c72eb2b0c36727a9852947e3a772246e931e97a53245381042330d453760d7";
-  revision = "1";
-  editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl";
+  revision = "2";
+  editedCabalFile = "1ik9mdz5gdkw5bzj1ymsh8c6kihrl07j1imh1k5rwylnq1pmvlmc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/polyparse.nix b/pkgs/polyparse.nix
index 1a3c769cfaa0590c9c5579126c4144d54312b7b9..448cdf161f21ad1489e289f6fc61aab3da7894ae 100644
--- a/pkgs/polyparse.nix
+++ b/pkgs/polyparse.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "polyparse";
   version = "1.13";
   sha256 = "1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b";
-  revision = "6";
-  editedCabalFile = "0xrmzz7p2akgdyr7gm54yvq83lm9qixcrk72ia2w9xcs2r4b76vz";
+  revision = "9";
+  editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/polysemy-plugin.nix b/pkgs/polysemy-plugin.nix
index 6f328cab109072be6bb809e829a4267431ee8aee..946bb66ebbb3096488863a0cc7fe37438ce6be12 100644
--- a/pkgs/polysemy-plugin.nix
+++ b/pkgs/polysemy-plugin.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "polysemy-plugin";
-  version = "0.4.5.0";
-  sha256 = "f0792f0ff445626e45af97c32d1513a389a0e2e90a60583aa93f707ccd1106e0";
+  version = "0.4.5.1";
+  sha256 = "d7ac12b678daff450bd8ffd5e4ac2a9872775be8b5fa325f9a7da49a127fcf18";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/polysemy-test.nix b/pkgs/polysemy-test.nix
index f905fd696f1cfbedaf899214f67903e091470128..068b257a4c44d6ac43158c102246f376689c8a77 100644
--- a/pkgs/polysemy-test.nix
+++ b/pkgs/polysemy-test.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "polysemy-test";
-  version = "0.7.0.0";
-  sha256 = "d4b3588cba21b69990ee483e37536b4b1e411f94774c62f90202360f8709d768";
+  version = "0.9.0.0";
+  sha256 = "471f3e2d6c1b29b1cdfb827ef12db59eee6c95b66c010b4eaf039744c3d65e25";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
@@ -23,7 +23,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/tek/polysemy-test#readme";
-  description = "Polysemy Effects for Testing";
+  description = "Polysemy effects for testing";
   license = "BSD-2-Clause-Patent";
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/polysemy-time.nix b/pkgs/polysemy-time.nix
index 774c9fd83613b39b96d862e789e1fec0016874f5..c568b2056dc481d39ae8aa5703cebfeb01644ccb 100644
--- a/pkgs/polysemy-time.nix
+++ b/pkgs/polysemy-time.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "polysemy-time";
-  version = "0.6.0.0";
-  sha256 = "5764ea3ab9c8b3c6e5c73fd7700f29ba49c82dc06fbb5f40650783c663b8854e";
+  version = "0.6.0.2";
+  sha256 = "5dcd02f89ab3aae2ef1a6cfe71554443ff76d949e0a96f0e85c9fe73a1efe0fd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -22,7 +22,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/tek/polysemy-time#readme";
-  description = "Polysemy effects for time";
+  description = "A Polysemy effect for time";
   license = "BSD-2-Clause-Patent";
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/polysemy-zoo.nix b/pkgs/polysemy-zoo.nix
index 223f3cb9076573d5acd13ae79fa2e0fd7a5f547d..e1f7c33ec3d2ed660446e4a124bee74cc043abe2 100644
--- a/pkgs/polysemy-zoo.nix
+++ b/pkgs/polysemy-zoo.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "polysemy-zoo";
-  version = "0.8.1.0";
-  sha256 = "2d786f3e178f49a17d7d0e21b58a763da1a032ef8136b492700f3856ef94145d";
+  version = "0.8.2.0";
+  sha256 = "d7fd0c7ae87380d563104cb0e3279f66b83b6f7a656344c79b2720a7f16b4a51";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -28,7 +28,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/isovector/polysemy-zoo#readme";
+  homepage = "https://github.com/polysemy-research/polysemy-zoo#readme";
   description = "Experimental, user-contributed effects and interpreters for polysemy";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/polysemy.nix b/pkgs/polysemy.nix
index 09feb7bc052bbb674b1dbe03d179cfa085384bc9..4566fa993cf91858a6be133d1b6192da209de990 100644
--- a/pkgs/polysemy.nix
+++ b/pkgs/polysemy.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "polysemy";
-  version = "1.9.1.0";
-  sha256 = "7b334414dd95c8cd9ccc16b65c9fa68f0065bca9846f7ab96b5b425ab5ed1d4b";
+  version = "1.9.1.3";
+  sha256 = "68d1d8bbd4ce7be633ae486793268051b6eb24d22a76372ea759f815c6694557";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/postgres-options.nix b/pkgs/postgres-options.nix
index 906d4caf4b98cdbd1fd71fe1f30b0f197cee4c80..4b8ea38643f842ef5c4c82948291b0b83311ed3a 100644
--- a/pkgs/postgres-options.nix
+++ b/pkgs/postgres-options.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "postgres-options";
-  version = "0.2.0.0";
-  sha256 = "c45f459abcc797d0707c1931301434037acdfada33e47c843f219cf35609d9b5";
+  version = "0.2.1.0";
+  sha256 = "0ab2acf4447abec49ca0ffa71de5732d40b04ed0f791e7f7f6c7672f3644936d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/postgresql-binary.nix b/pkgs/postgresql-binary.nix
index 4b9344c0bce72dc28e7897ebcd57b8a023a6b88c..cc04463a39137106ecbc32b0bcdc4727085892dd 100644
--- a/pkgs/postgresql-binary.nix
+++ b/pkgs/postgresql-binary.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "postgresql-binary";
-  version = "0.13.1";
-  sha256 = "a2ce0f6302b9482835675f78b2051a95ffcc5c0d9e8c1b7ca670ea5ea5b61951";
+  version = "0.13.1.1";
+  sha256 = "8bd3d7fbf638b42350d30bbe0a8b504993e00b17cb4aa403ee6cce995890499b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/postgresql-libpq.nix b/pkgs/postgresql-libpq.nix
index 10f439b8220f7075d8c661c0a81367130bd0e6ff..daabc8d8f7b4ef18cdcfb750fca350c4b7d60824 100644
--- a/pkgs/postgresql-libpq.nix
+++ b/pkgs/postgresql-libpq.nix
@@ -1,10 +1,8 @@
 { mkDerivation, Cabal, base, bytestring, lib, postgresql, unix }:
 mkDerivation {
   pname = "postgresql-libpq";
-  version = "0.9.5.0";
-  sha256 = "d1592bd805c088bb0c136c03eea92af9c1d7dbd85e32d0b6d522fd940f325470";
-  revision = "1";
-  editedCabalFile = "02g69cm1nqvvakyjs7ps2q9nkl4vpcdcxl41s7hzpy3vjhyar036";
+  version = "0.10.0.0";
+  sha256 = "54bca8926fafea05870437732a4d4a200558053b36f9f0867fd3689e035bdf62";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/postgresql-migration.nix b/pkgs/postgresql-migration.nix
index 97f84420c93ef92870d65cfeba3e252c039d9e60..8cfe33c7387f7002e6649f0d5c0606c2692e0350 100644
--- a/pkgs/postgresql-migration.nix
+++ b/pkgs/postgresql-migration.nix
@@ -1,19 +1,21 @@
-{ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+{ mkDerivation, base, base64-bytestring, bytestring, cryptohash-md5
 , directory, filepath, hspec, lib, postgresql-simple, text, time
 }:
 mkDerivation {
   pname = "postgresql-migration";
-  version = "0.2.1.6";
-  sha256 = "6ef9efa84bf30b9d5a7dbd869648a71c48da784ff222fb74c06f4ca493baa67f";
+  version = "0.2.1.7";
+  sha256 = "e838a5f15eb1f5614cda1c6078fe534589768421fad6b5d54ea4149092af1765";
+  revision = "1";
+  editedCabalFile = "1s5kcfnbsh5y1jsybvpl92j32wp43n8pd56981wynnrhh3kinlbv";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base base64-bytestring bytestring cryptohash directory filepath
+    base base64-bytestring bytestring cryptohash-md5 directory filepath
     postgresql-simple text time
   ];
   executableHaskellDepends = [
-    base base64-bytestring bytestring cryptohash directory
+    base base64-bytestring bytestring cryptohash-md5 directory
     postgresql-simple text time
   ];
   testHaskellDepends = [ base bytestring hspec postgresql-simple ];
diff --git a/pkgs/postgresql-simple.nix b/pkgs/postgresql-simple.nix
index f5e0a8c69b0544c5fdb152f488f19d04e594bb36..0cf9cf95a43b2e9c5dc1ff80320f1a465ddb53a4 100644
--- a/pkgs/postgresql-simple.nix
+++ b/pkgs/postgresql-simple.nix
@@ -1,24 +1,21 @@
 { mkDerivation, HUnit, Only, aeson, attoparsec, base
-, base16-bytestring, bytestring, bytestring-builder
-, case-insensitive, containers, cryptohash-md5, filepath, hashable
-, inspection-testing, lib, postgresql-libpq, scientific, tasty
-, tasty-golden, tasty-hunit, template-haskell, text, time-compat
-, transformers, uuid-types, vector
+, base16-bytestring, bytestring, case-insensitive, containers
+, cryptohash-md5, filepath, hashable, inspection-testing, lib
+, postgresql-libpq, scientific, tasty, tasty-golden, tasty-hunit
+, template-haskell, text, time-compat, transformers, uuid-types
+, vector
 }:
 mkDerivation {
   pname = "postgresql-simple";
-  version = "0.6.5";
-  sha256 = "fda53ab2a72bbe402947526ccb02f9928563eae03e0832bb871c00912e455e96";
-  revision = "1";
-  editedCabalFile = "0yiqbac742vyhnd9kz390amkfa1dshqm76hf9nsam27cq7h7m7i5";
+  version = "0.7.0.0";
+  sha256 = "8cb81bb55100715e590d3215d0f0eb6f6c39cc070c070ab621b00cfcc5e4a13e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson attoparsec base bytestring bytestring-builder
-    case-insensitive containers hashable Only postgresql-libpq
-    scientific template-haskell text time-compat transformers
-    uuid-types vector
+    aeson attoparsec base bytestring case-insensitive containers
+    hashable Only postgresql-libpq scientific template-haskell text
+    time-compat transformers uuid-types vector
   ];
   testHaskellDepends = [
     aeson base base16-bytestring bytestring case-insensitive containers
diff --git a/pkgs/pqueue.nix b/pkgs/pqueue.nix
index 260ebd23da4fe96762feb22790f5ebfaae0b18bb..ed0c3fcaeb3d9d7b9a660c36bffc7854e261a4ee 100644
--- a/pkgs/pqueue.nix
+++ b/pkgs/pqueue.nix
@@ -3,13 +3,17 @@
 }:
 mkDerivation {
   pname = "pqueue";
-  version = "1.4.3.0";
-  sha256 = "784bb4171a79fddc1a130621ae7deee1e850e966e31eae3db1e077c02502864e";
+  version = "1.5.0.0";
+  sha256 = "1bf88b8d2c4ac90dee3000684b6e0078502dc5a1030528b687aa143b3ecc1f02";
+  revision = "1";
+  editedCabalFile = "1n9gypnfgqlc1b6djjbkcr8r7bxqf8mpfd7avcf11s529gzk9qgg";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq indexed-traversable ];
-  testHaskellDepends = [ base deepseq tasty tasty-quickcheck ];
+  testHaskellDepends = [
+    base deepseq indexed-traversable tasty tasty-quickcheck
+  ];
   benchmarkHaskellDepends = [ base deepseq random tasty-bench ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/pretty-hex.nix b/pkgs/pretty-hex.nix
deleted file mode 100644
index be4b7a13120b0949b4cfbde70624e8b70019a179..0000000000000000000000000000000000000000
--- a/pkgs/pretty-hex.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, lib }:
-mkDerivation {
-  pname = "pretty-hex";
-  version = "1.1";
-  sha256 = "27c78f299151a9a844f4a2c0f629fb99160901e78f78a688cb088bd532501731";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A library for hex dumps of ByteStrings";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pretty-show.nix b/pkgs/pretty-show.nix
deleted file mode 100644
index e7cf1a21183d525b5f7244e6f09b990e24fba72d..0000000000000000000000000000000000000000
--- a/pkgs/pretty-show.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, array, base, filepath, ghc-prim, happy
-, haskell-lexer, lib, pretty, text
-}:
-mkDerivation {
-  pname = "pretty-show";
-  version = "1.10";
-  sha256 = "307f9086e0b063d439dc4f513e36a145e8a57f23de448aefae2a6c00f6da6fd2";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    array base filepath ghc-prim haskell-lexer pretty text
-  ];
-  libraryToolDepends = [ happy ];
-  executableHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  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;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pretty-simple.nix b/pkgs/pretty-simple.nix
deleted file mode 100644
index 9fb7a64fd1b306417a35f5ed0f045d27398ec638..0000000000000000000000000000000000000000
--- a/pkgs/pretty-simple.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, Cabal, Glob, QuickCheck, base, cabal-doctest
-, containers, criterion, doctest, lib, mtl, optparse-applicative
-, prettyprinter, prettyprinter-ansi-terminal, template-haskell
-, text, transformers
-}:
-mkDerivation {
-  pname = "pretty-simple";
-  version = "4.1.2.0";
-  sha256 = "3cb47c3971599cb8c0330e1a2dbd63c67bfbe570bd879524ee802e81e7b02736";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    base containers mtl prettyprinter prettyprinter-ansi-terminal text
-    transformers
-  ];
-  executableHaskellDepends = [ base optparse-applicative text ];
-  testHaskellDepends = [
-    base doctest Glob QuickCheck template-haskell
-  ];
-  benchmarkHaskellDepends = [ base criterion text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/cdepillabout/pretty-simple";
-  description = "pretty printer for data types with a 'Show' instance";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/prettyprinter-ansi-terminal.nix b/pkgs/prettyprinter-ansi-terminal.nix
deleted file mode 100644
index c94a49ed87b8434e2f5206835d76683887bd2404..0000000000000000000000000000000000000000
--- a/pkgs/prettyprinter-ansi-terminal.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, ansi-terminal, base, base-compat
-, containers, deepseq, doctest, gauge, lib, prettyprinter, text
-}:
-mkDerivation {
-  pname = "prettyprinter-ansi-terminal";
-  version = "1.1.3";
-  sha256 = "813739308ad6050620578994effe21058a170a341716acf52573fae42b5b1db3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
-  testHaskellDepends = [ base doctest ];
-  benchmarkHaskellDepends = [
-    base base-compat containers deepseq gauge prettyprinter QuickCheck
-    text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/quchen/prettyprinter";
-  description = "ANSI terminal backend for the »prettyprinter« package";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/prettyprinter.nix b/pkgs/prettyprinter.nix
deleted file mode 100644
index ec62c157829624577ccaff019f28cee96cdf506d..0000000000000000000000000000000000000000
--- a/pkgs/prettyprinter.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, ansi-wl-pprint, base, base-compat
-, bytestring, containers, deepseq, doctest, gauge, lib, mtl
-, pgp-wordlist, quickcheck-instances, random, tasty, tasty-hunit
-, tasty-quickcheck, text, transformers
-}:
-mkDerivation {
-  pname = "prettyprinter";
-  version = "1.7.1";
-  sha256 = "5e6ea6903114fa118fcc359633dfb7ecddecb92c06c853d02a77b72b251f0b45";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [
-    base bytestring doctest pgp-wordlist QuickCheck
-    quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-  ];
-  benchmarkHaskellDepends = [
-    ansi-wl-pprint base base-compat containers deepseq gauge mtl
-    QuickCheck random text transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/quchen/prettyprinter";
-  description = "A modern, easy to use, well-documented, extensible pretty-printer";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/primitive-addr.nix b/pkgs/primitive-addr.nix
index d04926562a611287d359e0cc0e7e67066713c8f4..1ff902fe2d49a79fee8420f41cfbd0526b8f436a 100644
--- a/pkgs/primitive-addr.nix
+++ b/pkgs/primitive-addr.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "primitive-addr";
   version = "0.1.0.2";
   sha256 = "4281c3a429bc03ab2940d072a6cbd63948bdf2607561456d972ba3ca4db9211b";
-  revision = "1";
-  editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f";
+  revision = "2";
+  editedCabalFile = "1s18b6xm6906ldj8wd2b2j885xbgvf5mzabd4mpl1ic7a9205qgn";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/primitive-extras.nix b/pkgs/primitive-extras.nix
index 418e7f1582115743ab970af87c286c0d5d6afa40..22c3ac3bcc818c6deb80556c932140a05eb20b1a 100644
--- a/pkgs/primitive-extras.nix
+++ b/pkgs/primitive-extras.nix
@@ -1,12 +1,12 @@
 { mkDerivation, QuickCheck, base, bytestring, cereal
 , deferred-folds, focus, foldl, lib, list-t, primitive
-, primitive-unlifted, profunctors, quickcheck-instances, rerebase
-, tasty, tasty-hunit, tasty-quickcheck, vector
+, primitive-unlifted, profunctors, rerebase, tasty, tasty-hunit
+, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "primitive-extras";
-  version = "0.10.1.6";
-  sha256 = "39036db6f3ecae0adc93b3c4b9a895d9a549e29052167ab44303c87e9d2fabd3";
+  version = "0.10.1.10";
+  sha256 = "14f95972c51a7453573770cec6f345720ea83f375e03f7f1535c34de46a903ad";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,8 +15,8 @@ mkDerivation {
     primitive-unlifted profunctors vector
   ];
   testHaskellDepends = [
-    cereal deferred-folds focus primitive QuickCheck
-    quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+    cereal deferred-folds focus primitive QuickCheck rerebase tasty
+    tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/primitive-unlifted.nix b/pkgs/primitive-unlifted.nix
index 3db7bf84ab7617dbba5ef7f05ab4313a52294329..17d20c63abcdbea51883344c4b25cd351b7be8fb 100644
--- a/pkgs/primitive-unlifted.nix
+++ b/pkgs/primitive-unlifted.nix
@@ -1,16 +1,20 @@
-{ mkDerivation, base, bytestring, lib, primitive, stm, text-short
+{ mkDerivation, QuickCheck, array, base, bytestring, lib, primitive
+, quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short
 }:
 mkDerivation {
   pname = "primitive-unlifted";
-  version = "0.1.3.1";
-  sha256 = "8b330e1a7b146333344304334d67b60481535bb506f1e53500e2ef4bd9fb34be";
-  revision = "1";
-  editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf";
+  version = "2.1.0.0";
+  sha256 = "613421078a2f4c012a99233dbc7a8ff0a17a0cb5abfd9baf544f4695751a3d1e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring primitive text-short ];
-  testHaskellDepends = [ base primitive stm ];
+  libraryHaskellDepends = [
+    array base bytestring primitive text-short
+  ];
+  testHaskellDepends = [
+    base primitive QuickCheck quickcheck-classes-base stm tasty
+    tasty-quickcheck
+  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
diff --git a/pkgs/primitive.nix b/pkgs/primitive.nix
index 61d425193b3c407f4c3c30884c6bc3ce7524aa79..1c0240ab7071a4d89917b3f8901507eb3aece076 100644
--- a/pkgs/primitive.nix
+++ b/pkgs/primitive.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "primitive";
-  version = "0.8.0.0";
-  sha256 = "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f";
+  version = "0.9.0.0";
+  sha256 = "696d4bd291c94d736142d6182117dca4258d3ef28bfefdb649ac8b5ecd0999c7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/process-extras.nix b/pkgs/process-extras.nix
deleted file mode 100644
index 5b83b130431e5900565d5c2985f086ff8202a753..0000000000000000000000000000000000000000
--- a/pkgs/process-extras.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, ListLike, base, bytestring, data-default
-, deepseq, generic-deriving, lib, mtl, process, text
-}:
-mkDerivation {
-  pname = "process-extras";
-  version = "0.7.4";
-  sha256 = "293e75f849254ce0ce0d7fa659681917e07a557c602505a2f9e20777467e984e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring data-default deepseq generic-deriving ListLike mtl
-    process text
-  ];
-  testHaskellDepends = [ base HUnit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/seereason/process-extras";
-  description = "Process extras";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/procex.nix b/pkgs/procex.nix
deleted file mode 100644
index c7a917ee8f26dfd7d6edefb14fb8f195cd21619a..0000000000000000000000000000000000000000
--- a/pkgs/procex.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, async, base, bytestring, containers, deepseq, hspec
-, lib, unix, utf8-string
-}:
-mkDerivation {
-  pname = "procex";
-  version = "0.3.3";
-  sha256 = "96266d8189361a03628e7620be2bc704609c7616180eb375ab026ef979cbb9e4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base bytestring containers deepseq unix utf8-string
-  ];
-  testHaskellDepends = [ async base bytestring hspec unix ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Ergonomic process launching with extreme flexibility and speed";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/profunctors.nix b/pkgs/profunctors.nix
deleted file mode 100644
index 389a4797c04adce1ea284134589d3ae2846f4e27..0000000000000000000000000000000000000000
--- a/pkgs/profunctors.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, base-orphans, bifunctors, comonad
-, contravariant, distributive, lib, tagged, transformers
-}:
-mkDerivation {
-  pname = "profunctors";
-  version = "5.6.2";
-  sha256 = "65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a";
-  revision = "3";
-  editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans bifunctors comonad contravariant distributive
-    tagged transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/profunctors/";
-  description = "Profunctors";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/prometheus-client.nix b/pkgs/prometheus-client.nix
index 451bfe735b1fbdc5612df99feb2134772bba74d5..3166ba4c661f4d0216a96f93c9bfe0bf4b2f14d7 100644
--- a/pkgs/prometheus-client.nix
+++ b/pkgs/prometheus-client.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "prometheus-client";
-  version = "1.1.0";
-  sha256 = "7da537f479f4982b89ed7e898df6ce73f7351f621add6960adb36905c8d72cb9";
+  version = "1.1.1";
+  sha256 = "6a709ec749651d86e1e3a1189193d3d6a74489eaf8f10297c31cc863fc4644c8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/proteaaudio-sdl.nix b/pkgs/proteaaudio-sdl.nix
index 6ddca32d75e57c9a2928195b6506de8c51347f09..0a62c5d53d1f757e7705e65ee9bdb17e4a299512 100644
--- a/pkgs/proteaaudio-sdl.nix
+++ b/pkgs/proteaaudio-sdl.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "proteaaudio-sdl";
-  version = "0.9.3";
-  sha256 = "57f99c2ca828fd820c618936f970cc70d9457de48ba4ed097531085494b0ee84";
+  version = "0.10.1";
+  sha256 = "581a0c109d53ce7b33afb1242ac4bc89b1144a109ff778b8a69c4d69acfb3526";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/protolude.nix b/pkgs/protolude.nix
index cab517190d8195bd357ea26501e671c7311c796b..0111c1522fb0ec38bdbfd4b8916f2d3eac653431 100644
--- a/pkgs/protolude.nix
+++ b/pkgs/protolude.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "protolude";
   version = "0.3.3";
   sha256 = "6c39ded2c7e9f7b1a508e4400f0151cb325f4d80e35010c1d5afa58b48971a46";
+  revision = "2";
+  editedCabalFile = "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/psqueues.nix b/pkgs/psqueues.nix
deleted file mode 100644
index 3b2e0f3cb77d7554636c0877abf81e983c644a96..0000000000000000000000000000000000000000
--- a/pkgs/psqueues.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, HUnit, PSQueue, QuickCheck, array, base, containers
-, criterion, deepseq, fingertree-psqueue, ghc-prim, hashable, lib
-, mtl, random, tagged, tasty, tasty-hunit, tasty-quickcheck
-, unordered-containers
-}:
-mkDerivation {
-  pname = "psqueues";
-  version = "0.2.7.3";
-  sha256 = "d09750ba3578d905b54d0b3a60a7b468910a60b3165e5de98bf6f4efae3ebfb2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-  testHaskellDepends = [
-    array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
-    tasty-hunit tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    base containers criterion deepseq fingertree-psqueue ghc-prim
-    hashable mtl PSQueue random unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Pure priority search queues";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pureMD5.nix b/pkgs/pureMD5.nix
deleted file mode 100644
index b950a183f89568317019022112e4245fc40e14da..0000000000000000000000000000000000000000
--- a/pkgs/pureMD5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring, cereal
-, crypto-api, crypto-api-tests, lib, pretty-hex, tagged
-, test-framework, test-framework-quickcheck2
-}:
-mkDerivation {
-  pname = "pureMD5";
-  version = "2.1.4";
-  sha256 = "782beec0a020e30eae65b7ce735c0cbb3e8bd886e2e564ac9d06f21479df9363";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring cereal crypto-api tagged
-  ];
-  testHaskellDepends = [
-    base binary bytestring cereal crypto-api-tests pretty-hex
-    QuickCheck test-framework test-framework-quickcheck2
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-classes-base.nix b/pkgs/quickcheck-classes-base.nix
deleted file mode 100644
index b308dd4cc278ce97a1dff1e3a28f8a6d337ceb52..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-classes-base.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, lib, transformers }:
-mkDerivation {
-  pname = "quickcheck-classes-base";
-  version = "0.6.2.0";
-  sha256 = "901945e1c442c558d739bc28088a5564f25c4f3615ce7f03b67c5ecc087e8699";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers QuickCheck transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
-  description = "QuickCheck common typeclasses from `base`";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-classes.nix b/pkgs/quickcheck-classes.nix
deleted file mode 100644
index 535b90498c68573fc0826dfe453ae894f612b637..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-classes.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, base, base-orphans, containers
-, lib, primitive, primitive-addr, quickcheck-classes-base
-, semigroupoids, semirings, tagged, tasty, tasty-quickcheck
-, transformers, vector
-}:
-mkDerivation {
-  pname = "quickcheck-classes";
-  version = "0.6.5.0";
-  sha256 = "62e32ad01c194798ebfb1a39ea9c06ccd54bd6d21cf726e9d0fc9db56b093ca6";
-  revision = "1";
-  editedCabalFile = "1p52n2padxppj4wy3s4v8shs7zsd9hy9r4rdk21wg7l9dwbqss5a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base containers primitive primitive-addr QuickCheck
-    quickcheck-classes-base semigroupoids semirings transformers vector
-  ];
-  testHaskellDepends = [
-    aeson base base-orphans containers primitive QuickCheck
-    semigroupoids tagged tasty tasty-quickcheck transformers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
-  description = "QuickCheck common typeclasses";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-dynamic.nix b/pkgs/quickcheck-dynamic.nix
deleted file mode 100644
index 3d42e45a0f406b61241fb249ddeebf6500bbd295..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-dynamic.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, lib, mtl, random }:
-mkDerivation {
-  pname = "quickcheck-dynamic";
-  version = "3.0.2";
-  sha256 = "1e02d4067495fdd7e13c99accc1efceebce6ff1408e617f1a56dbaa247d9e345";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers mtl QuickCheck random ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/input-output-hk/quickcheck-dynamic#readme";
-  description = "A library for stateful property-based testing";
-  license = lib.licenses.asl20;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-instances.nix b/pkgs/quickcheck-instances.nix
deleted file mode 100644
index 177d68d54c67b4fa6671a36be3a985d3be658fd5..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-instances.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, OneTuple, QuickCheck, array, base, bytestring
-, case-insensitive, containers, data-fix, hashable
-, integer-logarithms, lib, old-time, primitive, scientific
-, splitmix, strict, tagged, text, text-short, these, time
-, time-compat, transformers, transformers-compat
-, unordered-containers, uuid-types, vector
-}:
-mkDerivation {
-  pname = "quickcheck-instances";
-  version = "0.3.29.1";
-  sha256 = "b23d8256345bd17d24c48b56e273973a12a89478a790983409b9157fbce3a24b";
-  revision = "1";
-  editedCabalFile = "0yl09mp9phfka70z0dl0lg1c0kmf1qyh3rmbc8nzakdbs77l9fj3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring case-insensitive containers data-fix hashable
-    integer-logarithms old-time OneTuple primitive QuickCheck
-    scientific splitmix strict tagged text text-short these time
-    time-compat transformers transformers-compat unordered-containers
-    uuid-types vector
-  ];
-  testHaskellDepends = [
-    base containers primitive QuickCheck tagged uuid-types
-  ];
-  benchmarkHaskellDepends = [ base bytestring QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/qc-instances";
-  description = "Common quickcheck instances";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-io.nix b/pkgs/quickcheck-io.nix
deleted file mode 100644
index 14bdc99fe1bc62c7deebac23725745b3031c9d36..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-io.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, lib }:
-mkDerivation {
-  pname = "quickcheck-io";
-  version = "0.2.0";
-  sha256 = "fb779119d79fe08ff4d502fb6869a70c9a8d5fd8ae0959f605c3c937efd96422";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base HUnit QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/quickcheck-io#readme";
-  description = "Use HUnit assertions as QuickCheck properties";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quickcheck-unicode.nix b/pkgs/quickcheck-unicode.nix
deleted file mode 100644
index a070e660f2c04c38e5f38b368dc8bf8b18ad36d0..0000000000000000000000000000000000000000
--- a/pkgs/quickcheck-unicode.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, QuickCheck, base, lib }:
-mkDerivation {
-  pname = "quickcheck-unicode";
-  version = "1.0.1.0";
-  sha256 = "132005ea7edff35e95139c36232a70698cd0f4f4d79dfaa4e66fbcf557d08368";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/bos/quickcheck-unicode";
-  description = "Generator and shrink functions for testing Unicode-related software";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/quote-quot.nix b/pkgs/quote-quot.nix
new file mode 100644
index 0000000000000000000000000000000000000000..73698e70a58a3b3ea0e13aada3e9f3724158166d
--- /dev/null
+++ b/pkgs/quote-quot.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, base, lib, tasty, tasty-bench, tasty-quickcheck
+, template-haskell
+}:
+mkDerivation {
+  pname = "quote-quot";
+  version = "0.2.1.0";
+  sha256 = "67dc25909c5b9bb373c66a9c9c1721d1e73915bd5518f42d1f97b793f42e4df7";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base template-haskell ];
+  testHaskellDepends = [
+    base tasty tasty-quickcheck template-haskell
+  ];
+  benchmarkHaskellDepends = [ base tasty-bench template-haskell ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/Bodigrim/quote-quot#readme";
+  description = "Divide without division";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/random-shuffle.nix b/pkgs/random-shuffle.nix
deleted file mode 100644
index 5cef4c449eb61586a4a0b9a18dfacf21d1d3c528..0000000000000000000000000000000000000000
--- a/pkgs/random-shuffle.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, MonadRandom, base, lib, random }:
-mkDerivation {
-  pname = "random-shuffle";
-  version = "0.0.4";
-  sha256 = "52704411f040fd0bf2361dad162e35dc13caa6535b2e4908d3513c00a95d0615";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base MonadRandom random ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Random shuffle implementation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/random.nix b/pkgs/random.nix
deleted file mode 100644
index a53c9901ed0e50e001cbac4fe816efb02ef4a7e3..0000000000000000000000000000000000000000
--- a/pkgs/random.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, base, bytestring, containers, deepseq, doctest, lib
-, mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty
-, tasty-bench, tasty-hunit, tasty-inspection-testing
-, tasty-smallcheck, time, transformers
-}:
-mkDerivation {
-  pname = "random";
-  version = "1.2.1.1";
-  sha256 = "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
-  testHaskellDepends = [
-    base bytestring containers doctest smallcheck stm tasty tasty-hunit
-    tasty-inspection-testing tasty-smallcheck transformers
-  ];
-  benchmarkHaskellDepends = [
-    base mtl primitive rdtsc split splitmix tasty-bench time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Pseudo-random number generation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/raven-haskell.nix b/pkgs/raven-haskell.nix
index 61682f5f0eea96ea554ce096284e0b93f80db6d7..0eb50b5adc8ab06502d8c682709b82c8d876354e 100644
--- a/pkgs/raven-haskell.nix
+++ b/pkgs/raven-haskell.nix
@@ -6,6 +6,8 @@ mkDerivation {
   pname = "raven-haskell";
   version = "0.1.4.1";
   sha256 = "5e7dcbb0fb0db15e5ca2bf56a8624b88f13ba3965b2b42c8f892f2e614cfe724";
+  revision = "1";
+  editedCabalFile = "1107g5f6sr7sjxnh2d3g727ncfqni6dsvda5hr99fh86vhm2g1wi";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/raw-strings-qq.nix b/pkgs/raw-strings-qq.nix
deleted file mode 100644
index d1b9ebf2d0100f77b47a29a9edff917d9ea50eab..0000000000000000000000000000000000000000
--- a/pkgs/raw-strings-qq.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HUnit, base, lib, template-haskell }:
-mkDerivation {
-  pname = "raw-strings-qq";
-  version = "1.1";
-  sha256 = "2e011ec26aeaa53ab43c30b7d9b5b0f661f24b4ebef8884c12c571353c0fbed3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [ base HUnit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/23Skidoo/raw-strings-qq";
-  description = "Raw string literals for Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/rdtsc.nix b/pkgs/rdtsc.nix
deleted file mode 100644
index 4314cd13d6994d0c9637e5ee7be10ce4bfed3f90..0000000000000000000000000000000000000000
--- a/pkgs/rdtsc.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "rdtsc";
-  version = "1.3.0.1";
-  sha256 = "54c9a925f68d6c60b405e92f9d3bd9ebfc25cce0c72d2313a6c7e1b7cc2ed950";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mgrabmueller/rdtsc";
-  description = "Binding for the rdtsc machine instruction";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/rebase.nix b/pkgs/rebase.nix
index 1e4ddaa74b7ab7430536eeafc07a1b1b93b06ad3..6308b271365068b3f7753d3e1660db6657b14889 100644
--- a/pkgs/rebase.nix
+++ b/pkgs/rebase.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "rebase";
-  version = "1.20";
-  sha256 = "9d1c7d60b71e56df3b1018ad9fd78cd20b9b81a96f6f00d16d06a7bc5f81239f";
+  version = "1.20.1.1";
+  sha256 = "106ce99d3c9bb5b0920cf8d03d98c3b2c90a08648bbab4ba93ad63a81d869abb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/recursion-schemes.nix b/pkgs/recursion-schemes.nix
index f36d721295d2f6933bf18950560b0c0caf45e9ba..9d8c9075ca769bdc963bc3943c63d225b7d4408c 100644
--- a/pkgs/recursion-schemes.nix
+++ b/pkgs/recursion-schemes.nix
@@ -1,18 +1,15 @@
-{ mkDerivation, HUnit, base, base-orphans, comonad, containers
-, data-fix, free, lib, template-haskell, th-abstraction
-, transformers
+{ mkDerivation, HUnit, base, comonad, containers, data-fix, free
+, lib, template-haskell, th-abstraction, transformers
 }:
 mkDerivation {
   pname = "recursion-schemes";
-  version = "5.2.2.4";
-  sha256 = "0c151bc90a9a28bab2beced0e450103e102f754ddfebb8f924fc8a3b11c4db43";
-  revision = "2";
-  editedCabalFile = "1617jz77d4f2hf54jfz30zbf18rcgl6h0nzn3rcl0gjxjavf5aq6";
+  version = "5.2.2.5";
+  sha256 = "5cb79bd5d6dd5a0adf61ccc37a93c4fcfaeb6077f60a975c895feb32744d97ec";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base base-orphans comonad containers data-fix free template-haskell
+    base comonad containers data-fix free template-haskell
     th-abstraction transformers
   ];
   testHaskellDepends = [ base HUnit template-haskell transformers ];
diff --git a/pkgs/recv.nix b/pkgs/recv.nix
deleted file mode 100644
index feab2cf0fff1da1a4c1aa1bfa3b2ea66b784b51f..0000000000000000000000000000000000000000
--- a/pkgs/recv.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, bytestring, hspec, hspec-discover, lib
-, network
-}:
-mkDerivation {
-  pname = "recv";
-  version = "0.1.0";
-  sha256 = "f664905cffb44b7f9cba604cd75bd69011a666ba06bccbcb7f3fae0cd4f14d5b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring network ];
-  testHaskellDepends = [ base bytestring hspec network ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/yesodweb/wai";
-  description = "Efficient network recv";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/reducers.nix b/pkgs/reducers.nix
deleted file mode 100644
index 278bfccd4aa3f96ec212ae0fe642653d65f7c9ea..0000000000000000000000000000000000000000
--- a/pkgs/reducers.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, fingertree
-, hashable, lib, semigroupoids, text, transformers
-, unordered-containers
-}:
-mkDerivation {
-  pname = "reducers";
-  version = "3.12.4";
-  sha256 = "c066f545df7947613217256d210ecb59ba709294e7b06dad8c4d8a9263635e43";
-  revision = "3";
-  editedCabalFile = "00xd4pyg0p4z0alyg1zy193jc3smq50y73dkafiphd73rzszxy9g";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers fingertree hashable semigroupoids
-    text transformers unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/reducers/";
-  description = "Semigroups, specialized containers and a general map/reduce framework";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/reflection.nix b/pkgs/reflection.nix
deleted file mode 100644
index 02e748adac8fba221ce872b63b004340844e2dce..0000000000000000000000000000000000000000
--- a/pkgs/reflection.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, hspec, hspec-discover
-, lib, template-haskell
-}:
-mkDerivation {
-  pname = "reflection";
-  version = "2.1.7";
-  sha256 = "6cbb18a8b02871533bb8b641dc6f76813a097d94404e5808bb5d52b0f0e415fd";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [ base containers hspec QuickCheck ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/reflection";
-  description = "Reifies arbitrary terms into types that can be reflected back into terms";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/regex-base.nix b/pkgs/regex-base.nix
deleted file mode 100644
index 222d1832229bc3c87f87e200cf44414ee1076634..0000000000000000000000000000000000000000
--- a/pkgs/regex-base.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, lib, text }:
-mkDerivation {
-  pname = "regex-base";
-  version = "0.94.0.2";
-  sha256 = "7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1";
-  revision = "1";
-  editedCabalFile = "1k2gzjm7xz69f7zr08wh2wzb5dhb659cvimsvx0g9p8cf5f45x2g";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ array base bytestring containers text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://wiki.haskell.org/Regular_expressions";
-  description = "Common \"Text.Regex.*\" API for Regex matching";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/regex-pcre-builtin.nix b/pkgs/regex-pcre-builtin.nix
index b77c68f36d29b5b22f28f903208955c93b422e74..0aa0302a92e038b77e5bb718662b7de071b7bb3b 100644
--- a/pkgs/regex-pcre-builtin.nix
+++ b/pkgs/regex-pcre-builtin.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "regex-pcre-builtin";
   version = "0.95.2.3.8.44";
   sha256 = "cacea6a45faf93df8afbf50ecb09f87acabfed0477cba4746205649eb52ec55e";
-  revision = "3";
-  editedCabalFile = "071s6k97z0wiqx5rga360awgj0a031gqm725835xxszdz36w0mbv";
+  revision = "6";
+  editedCabalFile = "1rn3649yqqrbd177mbyk12gdpbm3kdzjgnjqxfv68crah237y08j";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/regex-posix.nix b/pkgs/regex-posix.nix
deleted file mode 100644
index 81b174c189586ec18af573df81426b339ee17223..0000000000000000000000000000000000000000
--- a/pkgs/regex-posix.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, lib
-, regex-base
-}:
-mkDerivation {
-  pname = "regex-posix";
-  version = "0.96.0.1";
-  sha256 = "c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c";
-  revision = "1";
-  editedCabalFile = "1x5xkfddn3llxk4fngqbd8njssrwb7jlp0a0jxfrgdivbava9fwx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers regex-base
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "POSIX Backend for \"Text.Regex\" (regex-base)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/regex-tdfa.nix b/pkgs/regex-tdfa.nix
deleted file mode 100644
index c265854084404af23ddf66cd27c8b4d87631f749..0000000000000000000000000000000000000000
--- a/pkgs/regex-tdfa.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, directory
-, doctest-parallel, filepath, lib, mtl, parsec, regex-base, text
-, utf8-string
-}:
-mkDerivation {
-  pname = "regex-tdfa";
-  version = "1.3.2";
-  sha256 = "2660d7dc5f00718c39454c844d354dea26d605db9864f80951efad5f7284dfd1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers mtl parsec regex-base text
-  ];
-  testHaskellDepends = [
-    array base bytestring containers directory doctest-parallel
-    filepath mtl regex-base text utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://wiki.haskell.org/Regular_expressions";
-  description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/regex.nix b/pkgs/regex.nix
new file mode 100644
index 0000000000000000000000000000000000000000..95f9930fe53d7db93eeb041667bbbbce4dd810a2
--- /dev/null
+++ b/pkgs/regex.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, array, base, base-compat, bytestring, containers
+, hashable, lib, regex-base, regex-pcre-builtin, regex-tdfa
+, template-haskell, text, time, time-locale-compat, transformers
+, unordered-containers, utf8-string
+}:
+mkDerivation {
+  pname = "regex";
+  version = "1.1.0.2";
+  sha256 = "8a0404896452272d18bd9db078bd7d982b6268aa5bcf0d6fe5aa5256f174fedb";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    array base base-compat bytestring containers hashable regex-base
+    regex-pcre-builtin regex-tdfa template-haskell text time
+    time-locale-compat transformers unordered-containers utf8-string
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "http://regex.uk";
+  description = "Toolkit for regex-base";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/relude.nix b/pkgs/relude.nix
index de11e07186bdf9ef8c854e931aa53d956092af57..23ec20ed0fe36ce8f69075a30783437d9c710ba3 100644
--- a/pkgs/relude.nix
+++ b/pkgs/relude.nix
@@ -4,8 +4,10 @@
 }:
 mkDerivation {
   pname = "relude";
-  version = "1.2.0.0";
-  sha256 = "cbe177b3df1abf848704a1095f046af8006cb0e185151c00a19c8faa6f2c1273";
+  version = "1.2.1.0";
+  sha256 = "784f745bfa6bc008189c8d2af62a59e1a466b429f85d6427f6e25bf38545d725";
+  revision = "1";
+  editedCabalFile = "1dqgl50rlrq0d84x5ffm5d4sp275wfm3f03k25ryq0ni1prhrarc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/replace-megaparsec.nix b/pkgs/replace-megaparsec.nix
index e029fc4df0515aeb39f51c5a54f0255762b48f51..5d12670bb59a129dcd32c58d12e3e603cf55404e 100644
--- a/pkgs/replace-megaparsec.nix
+++ b/pkgs/replace-megaparsec.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, Cabal, base, bytestring, lib, megaparsec
+{ mkDerivation, base, bytestring, hspec, lib, megaparsec
 , parser-combinators, text
 }:
 mkDerivation {
   pname = "replace-megaparsec";
-  version = "1.4.5.0";
-  sha256 = "8ffa015a2421b7aa880866bc45a7350f134cc6edb865f9ff62af9706039a31d9";
+  version = "1.5.0.1";
+  sha256 = "a113c6dda580ab274ef1a7db2829b8804899f6b24ede622550e069e84ed2968c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     base bytestring megaparsec parser-combinators text
   ];
-  testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+  testHaskellDepends = [ base bytestring hspec megaparsec text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -20,7 +20,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/jamesdbrock/replace-megaparsec";
-  description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
+  description = "Find, replace, split string patterns with Megaparsec parsers (instead of regex)";
   license = lib.licenses.bsd2;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/repline.nix b/pkgs/repline.nix
deleted file mode 100644
index 86498e2e1fa3653ea8e71cd1fd4c8f76b789cfff..0000000000000000000000000000000000000000
--- a/pkgs/repline.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, containers, exceptions, haskeline, lib, mtl
-, process
-}:
-mkDerivation {
-  pname = "repline";
-  version = "0.4.2.0";
-  sha256 = "6181b3f106b4059eb1c86c4a442083c29335a1d9a3e7cfffecb962ec05b08d5a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers exceptions haskeline mtl process
-  ];
-  testHaskellDepends = [ base containers mtl process ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/sdiehl/repline";
-  description = "Haskeline wrapper for GHCi-like REPL interfaces";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/req.nix b/pkgs/req.nix
index 675ba44c51c92fc91639d2e4bceca67d8e4d0448..156c4b4c6e0d19715125e699e8964b6db4e89d84 100644
--- a/pkgs/req.nix
+++ b/pkgs/req.nix
@@ -1,25 +1,25 @@
 { mkDerivation, QuickCheck, aeson, authenticate-oauth, base
-, blaze-builder, bytestring, case-insensitive, connection
-, containers, exceptions, hspec, hspec-core, hspec-discover
+, blaze-builder, bytestring, case-insensitive, containers
+, crypton-connection, exceptions, hspec, hspec-core, hspec-discover
 , http-api-data, http-client, http-client-tls, http-types, lib
 , modern-uri, monad-control, mtl, retry, template-haskell, text
 , time, transformers, transformers-base, unliftio-core
 }:
 mkDerivation {
   pname = "req";
-  version = "3.13.0";
-  sha256 = "6432d95d6e6750b199b97c3d7147260dcf6f683127c87eb90b7a9f225739fac5";
-  revision = "1";
-  editedCabalFile = "0izg1pj2jbpdlg9i9g30i5h4rcshkawh5zdhlkq1n9xfgc6jqv2v";
+  version = "3.13.1";
+  sha256 = "1045c4158ef361ad913acfcc628e6ddf0c3131c33a7abc83858ec0bfa55bf932";
+  revision = "3";
+  editedCabalFile = "0dib8rwavjrp2bsv3pl3bgblqdfvky53k7qnv7ca4sq8070aqffp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
     aeson authenticate-oauth base blaze-builder bytestring
-    case-insensitive connection containers exceptions http-api-data
-    http-client http-client-tls http-types modern-uri monad-control mtl
-    retry template-haskell text time transformers transformers-base
-    unliftio-core
+    case-insensitive containers crypton-connection exceptions
+    http-api-data http-client http-client-tls http-types modern-uri
+    monad-control mtl retry template-haskell text transformers
+    transformers-base unliftio-core
   ];
   testHaskellDepends = [
     aeson base blaze-builder bytestring case-insensitive hspec
diff --git a/pkgs/rere.nix b/pkgs/rere.nix
deleted file mode 100644
index cf39ebb7289221dd0d60d2c9ce2ba963e635915c..0000000000000000000000000000000000000000
--- a/pkgs/rere.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, attoparsec, base, bytestring
-, clock, containers, criterion, derp, fetchgit, fin, lib, parsec
-, quickcheck-instances, tasty, tasty-quickcheck, transformers, vec
-}:
-mkDerivation {
-  pname = "rere";
-  version = "0.2";
-  src = fetchgit {
-    url = "https://github.com/phadej/rere";
-    sha256 = "114i6z7rskynf2dnnq13wsi5di3m4m4zw4mf64qvfxrmry3kci1f";
-    rev = "5173ca929506b0cb9751fce5635164fcb36d7467";
-    fetchSubmodules = true;
-  };
-  revision = "3";
-  editedCabalFile = "01d112sii06yz06lpw5i7q3v4gshha9f0d7vpdc0yj2v34f45crv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers fin parsec QuickCheck transformers vec
-  ];
-  testHaskellDepends = [
-    base containers QuickCheck quickcheck-instances tasty
-    tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    aeson attoparsec base bytestring clock containers criterion derp
-    fin parsec vec
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Regular-expressions extended with fixpoints for context-free powers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/rerebase.nix b/pkgs/rerebase.nix
index 0de979972bb9c78213e6ce8fae34fbe83a4b622d..5bbaaccebb2e37ef6044d01fb6a142b91fbcaab6 100644
--- a/pkgs/rerebase.nix
+++ b/pkgs/rerebase.nix
@@ -1,8 +1,8 @@
 { mkDerivation, lib, rebase }:
 mkDerivation {
   pname = "rerebase";
-  version = "1.20";
-  sha256 = "f207ec83ccff1c6860e6276153ef618caf4e20de9ce098eae1a188ef355c9adc";
+  version = "1.20.1.1";
+  sha256 = "9152f02db44b73e07a536cf922113de31d851c012ec89207ebc84fe0c59998e7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/resolv.nix b/pkgs/resolv.nix
index 3e45d05f318c8cb5ed72552a2db517ef2d579935..eeffbbad93cc9d38c9c138c7803759ce73e630e3 100644
--- a/pkgs/resolv.nix
+++ b/pkgs/resolv.nix
@@ -3,10 +3,10 @@
 }:
 mkDerivation {
   pname = "resolv";
-  version = "0.1.2.0";
-  sha256 = "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671";
-  revision = "6";
-  editedCabalFile = "1qhl69hrvdby2wmk1ip0mr3ghq57zqk1n06qp768bbpdanrfvxx1";
+  version = "0.2.0.2";
+  sha256 = "880d283df9132a7375fa28670f71e86480a4f49972256dc2a204c648274ae74b";
+  revision = "3";
+  editedCabalFile = "0i9h81lrl0gdk6i1yrg2kqdx89fzr0wb29b6p7g2y3bnnmd2cs28";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/resourcet.nix b/pkgs/resourcet.nix
deleted file mode 100644
index e03cf96593c9defbd23a55b232ce94fa523d5b0f..0000000000000000000000000000000000000000
--- a/pkgs/resourcet.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, containers, exceptions, hspec, lib, mtl
-, primitive, transformers, unliftio-core
-}:
-mkDerivation {
-  pname = "resourcet";
-  version = "1.3.0";
-  sha256 = "ec601785ee42a201f32adb205b8685c983f18757b1bd33d2e806d571e0f9996b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers exceptions mtl primitive transformers unliftio-core
-  ];
-  testHaskellDepends = [ base exceptions hspec transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/snoyberg/conduit";
-  description = "Deterministic allocation and freeing of scarce resources";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/row-types.nix b/pkgs/row-types.nix
index 1dabf1773480074f7736ed3b3f08d9acb39d8599..f391a8c4542a33a05e928ec2b247a9e6958bb29b 100644
--- a/pkgs/row-types.nix
+++ b/pkgs/row-types.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "row-types";
   version = "1.0.1.2";
   sha256 = "0ea98606fe49d69311800ae29200162dd2dd915088da197b8b9a9fe818b46e17";
+  revision = "1";
+  editedCabalFile = "0r1vjdwnvavlv1pkl27gjpvc3d165bam4y4pp8l2p8q6bnwpqk2d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -21,7 +23,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/target/row-types";
+  homepage = "https://github.com/dwincort/row-types";
   description = "Open Records and Variants";
   license = lib.licenses.mit;
   broken = false;
diff --git a/pkgs/safe-coloured-text-layout.nix b/pkgs/safe-coloured-text-layout.nix
deleted file mode 100644
index c6fa398970f8afd02132fbe36bee0400d153553f..0000000000000000000000000000000000000000
--- a/pkgs/safe-coloured-text-layout.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, lib, safe-coloured-text, sydtest
-, sydtest-discover, text, validity
-}:
-mkDerivation {
-  pname = "safe-coloured-text-layout";
-  version = "0.0.0.0";
-  sha256 = "7c19de565f93b9c183698dd238b66e0e68ae9d5827f93ab9f79036933476cb85";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base safe-coloured-text text validity ];
-  testHaskellDepends = [
-    base bytestring safe-coloured-text sydtest text
-  ];
-  testToolDepends = [ sydtest-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/safe-coloured-text#readme";
-  description = "Safely layout output coloured text";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/safe-coloured-text-terminfo.nix b/pkgs/safe-coloured-text-terminfo.nix
deleted file mode 100644
index 053df0844dc576a96502a04b0d1375a689a4dab8..0000000000000000000000000000000000000000
--- a/pkgs/safe-coloured-text-terminfo.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, safe-coloured-text, terminfo }:
-mkDerivation {
-  pname = "safe-coloured-text-terminfo";
-  version = "0.1.0.0";
-  sha256 = "9635eae90307730ead9064c5c8dd59bd7c58a12d7a7d0723b54b755d860fdae1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base safe-coloured-text terminfo ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/safe-coloured-text#readme";
-  description = "Safely output coloured text";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/safe-coloured-text.nix b/pkgs/safe-coloured-text.nix
deleted file mode 100644
index 2a471e676268ee8af20d12b167e507f2d8b85315..0000000000000000000000000000000000000000
--- a/pkgs/safe-coloured-text.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, bytestring, lib, text, validity
-, validity-bytestring, validity-text
-}:
-mkDerivation {
-  pname = "safe-coloured-text";
-  version = "0.2.0.1";
-  sha256 = "b1604a221ee28e672a5b876a9f368ebbd65d56cc93afeb486083857d7c9b1759";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring text validity validity-bytestring validity-text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/safe-coloured-text#readme";
-  description = "Safely output coloured text";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/safe-exceptions.nix b/pkgs/safe-exceptions.nix
deleted file mode 100644
index 3e8c1400170719be7918d054e129a00dda55e936..0000000000000000000000000000000000000000
--- a/pkgs/safe-exceptions.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, deepseq, exceptions, hspec, lib, transformers
-, void
-}:
-mkDerivation {
-  pname = "safe-exceptions";
-  version = "0.1.7.3";
-  sha256 = "91ce28d8f8a6efd31788d4827ed5cdcb9a546ad4053a86c56f7947c66a30b5bf";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq exceptions transformers ];
-  testHaskellDepends = [ base hspec transformers void ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/safe-exceptions#readme";
-  description = "Safe, consistent, and easy exception handling";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/safe.nix b/pkgs/safe.nix
deleted file mode 100644
index e75b5d4cbff499ac144c5af568f5559ce7804dc1..0000000000000000000000000000000000000000
--- a/pkgs/safe.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, lib }:
-mkDerivation {
-  pname = "safe";
-  version = "0.3.19";
-  sha256 = "25043442c8f8aa95955bb17467d023630632b961aaa61e807e325d9b2c33f7a2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base deepseq QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/safe#readme";
-  description = "Library of safe (exception free) functions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sandwich.nix b/pkgs/sandwich.nix
index 5ca35055a6a2582207132a0087970b080ce0008d..f948843777d6eb7523de2ea8635a1d9ef93cccf9 100644
--- a/pkgs/sandwich.nix
+++ b/pkgs/sandwich.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, ansi-terminal, async, base, brick
-, bytestring, colour, containers, directory, exceptions, filepath
-, free, haskell-src-exts, lib, lifted-async, microlens
+, bytestring, colour, containers, deepseq, directory, exceptions
+, filepath, free, haskell-src-exts, lib, lifted-async, microlens
 , microlens-th, monad-control, monad-logger, mtl
 , optparse-applicative, pretty-show, process, safe, safe-exceptions
 , stm, string-interpolate, template-haskell, text, time
@@ -8,31 +8,31 @@
 }:
 mkDerivation {
   pname = "sandwich";
-  version = "0.1.3.2";
-  sha256 = "53798b02cbe82103e27104b57592e92ac957a6d08ff71922534af7719adf5d46";
+  version = "0.1.5.2";
+  sha256 = "214f74ecbed388d68a268969e28b7083a0f34568ccde52b827db59b4b1b12a77";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     aeson ansi-terminal async base brick bytestring colour containers
-    directory exceptions filepath free haskell-src-exts lifted-async
-    microlens microlens-th monad-control monad-logger mtl
+    deepseq directory exceptions filepath free haskell-src-exts
+    lifted-async microlens microlens-th monad-control monad-logger mtl
     optparse-applicative pretty-show process safe safe-exceptions stm
     string-interpolate template-haskell text time transformers
     transformers-base unix unliftio-core vector vty
   ];
   executableHaskellDepends = [
     aeson ansi-terminal async base brick bytestring colour containers
-    directory exceptions filepath free haskell-src-exts lifted-async
-    microlens microlens-th monad-control monad-logger mtl
+    deepseq directory exceptions filepath free haskell-src-exts
+    lifted-async microlens microlens-th monad-control monad-logger mtl
     optparse-applicative pretty-show process safe safe-exceptions stm
     string-interpolate template-haskell text time transformers
     transformers-base unix unliftio-core vector vty
   ];
   testHaskellDepends = [
     aeson ansi-terminal async base brick bytestring colour containers
-    directory exceptions filepath free haskell-src-exts lifted-async
-    microlens microlens-th monad-control monad-logger mtl
+    deepseq directory exceptions filepath free haskell-src-exts
+    lifted-async microlens microlens-th monad-control monad-logger mtl
     optparse-applicative pretty-show process safe safe-exceptions stm
     string-interpolate template-haskell text time transformers
     transformers-base unix unliftio-core vector vty
diff --git a/pkgs/scientific.nix b/pkgs/scientific.nix
deleted file mode 100644
index 0f58c4e1a68513b2bd8d85a6f3583369a9b38215..0000000000000000000000000000000000000000
--- a/pkgs/scientific.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring, containers
-, criterion, deepseq, hashable, integer-logarithms, lib, primitive
-, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-, tasty-smallcheck, template-haskell, text
-}:
-mkDerivation {
-  pname = "scientific";
-  version = "0.3.7.0";
-  sha256 = "a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9";
-  revision = "5";
-  editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring containers deepseq hashable
-    integer-logarithms primitive template-haskell text
-  ];
-  testHaskellDepends = [
-    base binary bytestring QuickCheck smallcheck tasty tasty-hunit
-    tasty-quickcheck tasty-smallcheck text
-  ];
-  benchmarkHaskellDepends = [ base criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/basvandijk/scientific";
-  description = "Numbers represented using scientific notation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/scotty.nix b/pkgs/scotty.nix
index 2f982bbdacf03b7477584531e144f978d644699d..8e97a77dff412c50855716267d1392c22ab966d1 100644
--- a/pkgs/scotty.nix
+++ b/pkgs/scotty.nix
@@ -1,33 +1,30 @@
-{ mkDerivation, aeson, async, base, base-compat-batteries
-, blaze-builder, bytestring, case-insensitive, data-default-class
-, directory, exceptions, hspec, hspec-discover, hspec-wai
-, http-types, lib, lifted-base, lucid, monad-control, mtl, network
-, regex-compat, text, transformers, transformers-base
-, transformers-compat, wai, wai-extra, warp, weigh
+{ mkDerivation, aeson, async, base, blaze-builder, bytestring
+, case-insensitive, cookie, data-default-class, directory
+, exceptions, hspec, hspec-discover, hspec-wai, http-types, lib
+, lifted-base, lucid, monad-control, mtl, network, regex-compat
+, stm, text, time, transformers, transformers-base
+, transformers-compat, unliftio, wai, wai-extra, warp, weigh
 }:
 mkDerivation {
   pname = "scotty";
-  version = "0.12.1";
-  sha256 = "1e2a33ff37765d9e1de7fc7b8f20a75b91b008ada60c1e445df06c7fc614db4a";
-  revision = "1";
-  editedCabalFile = "04l4vr53can02jyl6yfxis61al03f4i1p5l2vmdwd8qb3g9026xs";
+  version = "0.20.1";
+  sha256 = "6d9a886c49aaef9b46f06f5aea61a57113d32212ddc7a9ef1921b68f8e9ce09c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson base base-compat-batteries blaze-builder bytestring
-    case-insensitive data-default-class exceptions http-types
-    monad-control mtl network regex-compat text transformers
-    transformers-base transformers-compat wai wai-extra warp
+    aeson base blaze-builder bytestring case-insensitive cookie
+    data-default-class exceptions http-types monad-control mtl network
+    regex-compat stm text time transformers transformers-base
+    transformers-compat unliftio wai wai-extra warp
   ];
   testHaskellDepends = [
-    async base bytestring data-default-class directory hspec hspec-wai
-    http-types lifted-base network text wai
+    async base bytestring directory hspec hspec-wai http-types
+    lifted-base network text wai
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base bytestring data-default-class lucid mtl text transformers
-    weigh
+    base bytestring lucid mtl text transformers weigh
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/semialign.nix b/pkgs/semialign.nix
deleted file mode 100644
index 0872ceca72376ae43ecd19857054222dfb4c1996..0000000000000000000000000000000000000000
--- a/pkgs/semialign.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, hashable, indexed-traversable
-, indexed-traversable-instances, lib, semigroupoids, tagged, these
-, transformers, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "semialign";
-  version = "1.3";
-  sha256 = "628e43319f584a8dd46c124ee0685cac586e0f6f877c5ceff37c3dbb2e3cc56c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers hashable indexed-traversable
-    indexed-traversable-instances semigroupoids tagged these
-    transformers unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/these";
-  description = "Align and Zip type-classes from the common Semialign ancestor";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/semigroupoids.nix b/pkgs/semigroupoids.nix
deleted file mode 100644
index 4657c6a46217b016bbc177b1b9e76692a9b3c0ed..0000000000000000000000000000000000000000
--- a/pkgs/semigroupoids.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, base-orphans, bifunctors, comonad, containers
-, contravariant, distributive, foldable1-classes-compat, hashable
-, lib, tagged, template-haskell, transformers, transformers-compat
-, unordered-containers
-}:
-mkDerivation {
-  pname = "semigroupoids";
-  version = "6.0.0.1";
-  sha256 = "7da38a9891bdf8205fd6522cdb712956b8c0bf5c52983da60295c8e057d77934";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans bifunctors comonad containers contravariant
-    distributive foldable1-classes-compat hashable tagged
-    template-haskell transformers transformers-compat
-    unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/semigroupoids";
-  description = "Semigroupoids: Category sans id";
-  license = lib.licenses.bsd2;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/semigroups.nix b/pkgs/semigroups.nix
deleted file mode 100644
index b2ceebea1b9aad0c5b39d8df4dd6801b58c423c7..0000000000000000000000000000000000000000
--- a/pkgs/semigroups.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "semigroups";
-  version = "0.20";
-  sha256 = "902d2e33c96b40a89de5957f2a9e097197afcc35e257e45b32ebe770993673e1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/semigroups/";
-  description = "Anything that associates";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/semirings.nix b/pkgs/semirings.nix
deleted file mode 100644
index 99e863bbacba21034dd705460aca5f7015efac28..0000000000000000000000000000000000000000
--- a/pkgs/semirings.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, base-compat-batteries, containers, hashable
-, lib, unordered-containers
-}:
-mkDerivation {
-  pname = "semirings";
-  version = "0.6";
-  sha256 = "99356619b137c7c4cf6597909be3c9df118f08a7dff4897549e350b95719059b";
-  revision = "1";
-  editedCabalFile = "1c06yhfa053sv3rfz0d72a33l5qb0xmj1b3hy2z7pzxrcay6g1yc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-compat-batteries containers hashable unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/chessai/semirings";
-  description = "two monoids as one, in holy haskimony";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/serialise.nix b/pkgs/serialise.nix
deleted file mode 100644
index 3cc7a24fd94a47bc4ce4e1ba0edf2f402250b191..0000000000000000000000000000000000000000
--- a/pkgs/serialise.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ mkDerivation, QuickCheck, aeson, array, base, binary, bytestring
-, cborg, cereal, cereal-vector, containers, criterion, deepseq
-, directory, fail, filepath, ghc-prim, half, hashable, lib, pretty
-, primitive, quickcheck-instances, semigroups, store, strict, tar
-, tasty, tasty-hunit, tasty-quickcheck, text, these, time
-, unordered-containers, vector, zlib
-}:
-mkDerivation {
-  pname = "serialise";
-  version = "0.2.6.0";
-  sha256 = "93ff1888e1972999f14663072b38efcfd0c1481b4ec8e30ddc9c5ce97681a516";
-  revision = "2";
-  editedCabalFile = "0ng4gjxwv2arm1ybqkfl66p1lmcwacym8ygi6nnkygysgchwqa3b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring cborg containers ghc-prim half hashable
-    primitive strict text these time unordered-containers vector
-  ];
-  testHaskellDepends = [
-    base bytestring cborg containers directory filepath primitive
-    QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
-    text time unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [
-    aeson array base binary bytestring cborg cereal cereal-vector
-    containers criterion deepseq directory fail filepath ghc-prim half
-    pretty semigroups store tar text time vector zlib
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/well-typed/cborg";
-  description = "A binary serialisation library for Haskell values";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-auth-client.nix b/pkgs/servant-auth-client.nix
index c1347f65e8d107a91ef170b39c4486e2cfc5a55c..ab807ec276c36deee28cb9cbb73743e66afc3111 100644
--- a/pkgs/servant-auth-client.nix
+++ b/pkgs/servant-auth-client.nix
@@ -6,10 +6,10 @@
 }:
 mkDerivation {
   pname = "servant-auth-client";
-  version = "0.4.1.0";
-  sha256 = "03c1c9e1413c05ae30c269a2fef07e68bf41ff675edd180452d863d073e3359b";
-  revision = "6";
-  editedCabalFile = "0d6mi3w3gx9h21awf1gy2wx7dwh5l9ichww21a3p5rfd8a8swypf";
+  version = "0.4.1.1";
+  sha256 = "18bf66c4f35b3da2c6991cc4c74d9594d6fe0134af0bbfaec6547c58c20540bb";
+  revision = "1";
+  editedCabalFile = "1ff5hcpc56w7q97myavmfrl5m8sv38mjcw83lgyy0g56d893svhw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -29,7 +29,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/haskell-servant/servant-auth#readme";
+  homepage = "https://github.com/haskell-servant/servant/tree/master/servant-auth#readme";
   description = "servant-client/servant-auth compatibility";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index a50c50e1dde9beb8a9c4a22b19d53b58f9ee3491..0f16e6d54d4b412a47bf80770167b6c4c602efa0 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -1,21 +1,16 @@
 { mkDerivation, QuickCheck, aeson, base, base64-bytestring
 , blaze-builder, bytestring, case-insensitive, cookie
-, data-default-class, entropy, fetchgit, hspec, hspec-discover
-, http-client, http-types, jose, lens, lens-aeson, lib
-, markdown-unlit, memory, monad-time, mtl, servant, servant-auth
-, servant-server, tagged, text, time, transformers
-, unordered-containers, wai, warp, wreq
+, data-default-class, entropy, hspec, hspec-discover, http-client
+, http-types, jose, lens, lens-aeson, lib, markdown-unlit, memory
+, monad-time, mtl, servant, servant-auth, servant-server, tagged
+, text, time, transformers, unordered-containers, wai, warp, wreq
 }:
 mkDerivation {
   pname = "servant-auth-server";
-  version = "0.4.7.0";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant-auth/servant-auth-server/; echo source root reset to $sourceRoot";
+  version = "0.4.8.0";
+  sha256 = "4e095626036c8e953dd7d5e2b1ef3424935ea2ec35a8dee74dc168296af23637";
+  revision = "1";
+  editedCabalFile = "0dff8ycslxv5zy74wiph27sscd2p3zkq09j043yy8mnaypmpn4xr";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-auth.nix b/pkgs/servant-auth.nix
index a053cce4233620d18f1877b75834b4debeeba55b..769d0bc039481978a3e0100b2a563e294ebdae01 100644
--- a/pkgs/servant-auth.nix
+++ b/pkgs/servant-auth.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "servant-auth";
   version = "0.4.1.0";
   sha256 = "add973fe8bcc1b68eaaf90a1ec8fd6933d11eabf3854f91371b77d6827b5ef21";
-  revision = "5";
-  editedCabalFile = "0azlfs9dvzcf2r3kbm76wmalyhg1w0vi9gc4xlwp8m2n509qhbda";
+  revision = "7";
+  editedCabalFile = "18ylz2071416hhiqy7n72dvpsfy2cmhsh5j96mmcmgx05fcpkswg";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-blaze.nix b/pkgs/servant-blaze.nix
index c4ae209d000e5c72af25022482f3a5203e7278a9..2a0bce67f1235b007580e980b91719aefddedbbe 100644
--- a/pkgs/servant-blaze.nix
+++ b/pkgs/servant-blaze.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "servant-blaze";
   version = "0.9.1";
   sha256 = "264aa17b95400a13cf23f7421f54b3a3160119c15380a31a96bdfc4a40f2db21";
-  revision = "1";
-  editedCabalFile = "1y38lzmh5jr3bix0cqrcx9zkjdr1598hz7rvpnm827qw0ln3cmra";
+  revision = "2";
+  editedCabalFile = "1bc933vfxwdcpgfxy34dkxpadv8j1j053rjxfl4lj0gajwxc5x48";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index 0fa6af1ea7fee6375f4c43df7f895832fb1d7646..d604592dda62ce5ca25413dedfa9dd36b62b45b0 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -1,19 +1,15 @@
 { mkDerivation, QuickCheck, aeson, base, base-compat
 , base64-bytestring, bytestring, constraints, containers, deepseq
-, exceptions, fetchgit, free, hspec, hspec-discover, http-media
-, http-types, lib, network-uri, safe, servant, sop-core
-, template-haskell, text, transformers
+, exceptions, free, hspec, hspec-discover, http-media, http-types
+, lib, network-uri, safe, servant, sop-core, template-haskell, text
+, transformers
 }:
 mkDerivation {
   pname = "servant-client-core";
-  version = "0.19";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant-client-core/; echo source root reset to $sourceRoot";
+  version = "0.20";
+  sha256 = "a6744916079ec769c248ff5f7a2cc62d7eb03abb445be6c1fa7811c2866b4b04";
+  revision = "1";
+  editedCabalFile = "0nkgan32s6v5s3sqk5wdw1m977gszwi8lnap5wrr3m47q7j4003l";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index 5c19aef1e6f1425c4a9a6d5e2a248e42bb63f3a2..1e3fda8e4bfcc09e3a06de90a94df5c6d2ad2086 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -1,6 +1,6 @@
 { mkDerivation, HUnit, QuickCheck, aeson, base, base-compat
-, bytestring, containers, deepseq, entropy, exceptions, fetchgit
-, hspec, hspec-discover, http-api-data, http-client, http-media
+, bytestring, containers, deepseq, entropy, exceptions, hspec
+, hspec-discover, http-api-data, http-client, http-media
 , http-types, kan-extensions, lib, markdown-unlit, monad-control
 , mtl, network, semigroupoids, servant, servant-client-core
 , servant-server, sop-core, stm, text, time, transformers
@@ -8,14 +8,10 @@
 }:
 mkDerivation {
   pname = "servant-client";
-  version = "0.19";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant-client/; echo source root reset to $sourceRoot";
+  version = "0.20";
+  sha256 = "765d30f3579b74bebfe79f59a4aacfd9dec0c02c7d355f389caa604f0ac3b276";
+  revision = "1";
+  editedCabalFile = "1bvj0rnnyqw3h70b94k9j21np5h0acxn4cla2gsv9zclhd99f4q6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-docs.nix b/pkgs/servant-docs.nix
index 463943bcfba4fdca55939aaa6dbf935cbee50235..90ab1e4c5195f36065c6936caa56dcc261cd5823 100644
--- a/pkgs/servant-docs.nix
+++ b/pkgs/servant-docs.nix
@@ -5,10 +5,8 @@
 }:
 mkDerivation {
   pname = "servant-docs";
-  version = "0.12";
-  sha256 = "632475d906e823325b01230453c2a357afa916b2410365290e5497811b956114";
-  revision = "5";
-  editedCabalFile = "191kb72gzyxr6w2a56775hhlckyg6ll9sasay7qqqg7mg7yvlfpn";
+  version = "0.13";
+  sha256 = "c75ce9536f7568606a8c67a7920c476fb91fba77140b379904d6b26590af2145";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-effectful.nix b/pkgs/servant-effectful.nix
index be8e699f7bc3ec3165c16895614d4a47e407fbc6..260e0aa626c8822dea75820cc0006512f491d88f 100644
--- a/pkgs/servant-effectful.nix
+++ b/pkgs/servant-effectful.nix
@@ -6,8 +6,8 @@ mkDerivation {
   version = "0.0.1.0";
   src = fetchgit {
     url = "https://github.com/kleidukos/servant-effectful";
-    sha256 = "1vrp4883jsnq4rgdh89qhka6zs2q96bfxi3m1iaqvc7984g1pl64";
-    rev = "65e3041c6cfbc315b20ad22ca18f61dda104eec8";
+    sha256 = "0klxkjhyy8bcm7azdvhq75zfwga08s7fjxpqx5i7ljl04ac74hsi";
+    rev = "21b5a1d7cb209f3b4594167bb0b5a8d632c8a8e1";
     fetchSubmodules = true;
   };
   isLibrary = true;
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index 72379fd23ddfe141940f4b556d0d5c7ac0513acc..61821f8157bc744c1542ceef8c6732c6c6bc476f 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -1,16 +1,12 @@
-{ mkDerivation, base, base-compat, fetchgit, hspec, hspec-discover
+{ mkDerivation, base, base-compat, hspec, hspec-discover
 , http-types, lens, lib, servant, text
 }:
 mkDerivation {
   pname = "servant-foreign";
-  version = "0.15.4";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant-foreign/; echo source root reset to $sourceRoot";
+  version = "0.16";
+  sha256 = "bbaeb1e42a335fa5f65e837deee782db77b61f068093170eafd2b3763ac8f196";
+  revision = "1";
+  editedCabalFile = "17rnd7dnkj5p8jpbmlgysacrdxxhczd4ll8r5r3bpd56yhj8wm2c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-lucid.nix b/pkgs/servant-lucid.nix
index 0a84cb13d39993cc1a0bf3073b1ee3ebafe28659..9868c146fbcbfb7f0be56aa03f35e72fe8161372 100644
--- a/pkgs/servant-lucid.nix
+++ b/pkgs/servant-lucid.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "servant-lucid";
   version = "0.9.0.6";
   sha256 = "a03973035722f9aee7a67fcbb6f44a2d515284e21b0bbf236fda3207132709fd";
+  revision = "1";
+  editedCabalFile = "1b76mpiicbx9n062q7br0da6hbmwrbkkc881rh87l0snl03rzpmp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-multipart-api.nix b/pkgs/servant-multipart-api.nix
index d693a7543eb60ca9f0d79a08f056057bcfb46040..78abfca700379e0197aa95f0083279d1e515da3b 100644
--- a/pkgs/servant-multipart-api.nix
+++ b/pkgs/servant-multipart-api.nix
@@ -4,8 +4,8 @@ mkDerivation {
   pname = "servant-multipart-api";
   version = "0.12.1";
   sha256 = "92d5c3b1ccbcde7abcff6eb639d7dbb836222452a965e73ebd40bf775e522ebe";
-  revision = "4";
-  editedCabalFile = "0fgkmnfz0mgld1rwdli05kx2wfdxy5fv37i73v3xyx65hn9hfcy0";
+  revision = "5";
+  editedCabalFile = "05243nl7sbc7p5rvqssiqha1qv38a0qp0ppb227pg0x748xh7ai4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-multipart.nix b/pkgs/servant-multipart.nix
index 50d6f97d9218306aafd52f13743df79f3e9b8b18..490699dc735ed3d8cde6468b79fac8873cfcacf0 100644
--- a/pkgs/servant-multipart.nix
+++ b/pkgs/servant-multipart.nix
@@ -7,8 +7,8 @@ mkDerivation {
   pname = "servant-multipart";
   version = "0.12.1";
   sha256 = "c5236fa4922a869947988d52ab9f5b0a19abf57bb0467e2eb34560f8c79aa5dc";
-  revision = "4";
-  editedCabalFile = "0z4n3a1cdb082nwh3ig68wjk617cvwpq0n9ivsab55nvsr2wsm8q";
+  revision = "5";
+  editedCabalFile = "0pf761m9l6jnqhljjj4i6zr9il8r9ajpqfxzqjgjsnbsg6872ykg";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-openapi3.nix b/pkgs/servant-openapi3.nix
index 40c0a2757290fc18c550c51abdfb1cd7bc9fbcfd..aa5657a839226f6d1ceced1374cc906c61e53793 100644
--- a/pkgs/servant-openapi3.nix
+++ b/pkgs/servant-openapi3.nix
@@ -9,8 +9,8 @@ mkDerivation {
   pname = "servant-openapi3";
   version = "2.0.1.6";
   sha256 = "322a2181fb2becb20b80ad8319dd3ce1874d89cd344a8d8a4e17d1428d1dbfc3";
-  revision = "3";
-  editedCabalFile = "0pnj7ns6lk5jb2p7i7y2mdyi7bcvf0yj23fzzc3z532zj8a28vaq";
+  revision = "5";
+  editedCabalFile = "0jy5yp7ag9783mw09dln0jkjgrhy7li4ilgcmydgl4d84izy3zhn";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index 7a6f140ac8c72c8fd6a1110ec4785355ebaf3864..6a49c80865dda4057475431104ed210dbe431f50 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -1,6 +1,6 @@
 { mkDerivation, QuickCheck, aeson, base, base-compat
 , base64-bytestring, bytestring, constraints, containers, directory
-, exceptions, fetchgit, filepath, hspec, hspec-discover, hspec-wai
+, exceptions, filepath, hspec, hspec-discover, hspec-wai
 , http-api-data, http-media, http-types, lib, monad-control, mtl
 , network, network-uri, resourcet, safe, servant
 , should-not-typecheck, sop-core, string-conversions, tagged
@@ -9,14 +9,10 @@
 }:
 mkDerivation {
   pname = "servant-server";
-  version = "0.19.2";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant-server/; echo source root reset to $sourceRoot";
+  version = "0.20";
+  sha256 = "13b2fe785be1aae07e15d139fa1f94c7c5db6c8d36d0fc7789576b31a9bee8be";
+  revision = "2";
+  editedCabalFile = "0x05ngrrgq4jqv5sfwsf35aziipvz64xajzh4a1b5cmh53q7kc8v";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index b3d8fbe1be58305d870ba8c544ed916c1d2627be..4ed33a68ed0cc290056510fca1c6df9d5ff7b988 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -1,20 +1,13 @@
 { mkDerivation, QuickCheck, aeson, attoparsec, base, base-compat
 , bifunctors, bytestring, case-insensitive, constraints, deepseq
-, fetchgit, hspec, hspec-discover, http-api-data, http-media
-, http-types, lib, mmorph, mtl, network-uri, quickcheck-instances
-, singleton-bool, sop-core, string-conversions, tagged, text
-, transformers, vault
+, hspec, hspec-discover, http-api-data, http-media, http-types, lib
+, mmorph, mtl, network-uri, quickcheck-instances, singleton-bool
+, sop-core, string-conversions, tagged, text, transformers, vault
 }:
 mkDerivation {
   pname = "servant";
-  version = "0.19.1";
-  src = fetchgit {
-    url = "https://github.com/haskell-servant/servant";
-    sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
-    rev = "7ae787371333556a7b84778631ed91d1d73e8370";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/servant/; echo source root reset to $sourceRoot";
+  version = "0.20.1";
+  sha256 = "94f773f9bdff67eb2d7aec9c67f80e8af79d531ba6f52fad2e142d8ce4551be9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/setenv.nix b/pkgs/setenv.nix
deleted file mode 100644
index e9e3cefbe78941be024c395e4bb3f0fd0723de82..0000000000000000000000000000000000000000
--- a/pkgs/setenv.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib, unix }:
-mkDerivation {
-  pname = "setenv";
-  version = "0.1.1.3";
-  sha256 = "e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32";
-  revision = "1";
-  editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base unix ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A cross-platform library for setting environment variables";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/setlocale.nix b/pkgs/setlocale.nix
index c265f735cc8172d860e940a145c959122eaff0ab..fd29260eb0345b334c55e4c67c9b7270ec3e9022 100644
--- a/pkgs/setlocale.nix
+++ b/pkgs/setlocale.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "setlocale";
   version = "1.0.0.10";
   sha256 = "3972ff10c22318f5451215dc886c1535fea5ab7dfefe5ce461b1603865423ba7";
-  revision = "3";
-  editedCabalFile = "1ich9zjmwc73ilblmbakl627mqpncyd79vnpkflms65qylqj6dvk";
+  revision = "4";
+  editedCabalFile = "0lpr3lrn28ig0q2cd5xgggzgf917xdpx1zq2q523r0qin6vbb44n";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/shakespeare.nix b/pkgs/shakespeare.nix
index 2c7ae977b69a8e58dec15983c587a927796c2a77..4ee81244ae9b6931edc34a6f38e0938cc482b7c4 100644
--- a/pkgs/shakespeare.nix
+++ b/pkgs/shakespeare.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "shakespeare";
-  version = "2.1.0";
-  sha256 = "3f59d2a4d6e5d59d932503adf15d53bccad388012ff86f806daedfd7c24e9fe1";
+  version = "2.1.0.1";
+  sha256 = "6cb655f3734de1b920faf67f313d45e31fc7f8fcf0a2e00a45f986d8e107d22f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/shh.nix b/pkgs/shh.nix
index 295b3737f8f855ac5c8786f7a6488f9ae77f9602..ae35d0759bfc93c7ee4b37d887fee3e821e210d7 100644
--- a/pkgs/shh.nix
+++ b/pkgs/shh.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "shh";
-  version = "0.7.2.1";
-  sha256 = "dbdaa98e8f5714e4d7bc6234d2e9371c3b613219febd529f323ccd560fc086dc";
+  version = "0.7.2.2";
+  sha256 = "919a6708671820d8adb9c89347aba33bf81b80041bcd4470bc6212c78b5122f8";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/silently.nix b/pkgs/silently.nix
deleted file mode 100644
index 442464ac7416311ff0dd07f0fcba260d9c6b4e72..0000000000000000000000000000000000000000
--- a/pkgs/silently.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, deepseq, directory, lib, nanospec, temporary
-}:
-mkDerivation {
-  pname = "silently";
-  version = "1.2.5.3";
-  sha256 = "ba9dafafd29438a830afd158c3b83ce157d50e984352ff3ddf60a74c22f36372";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq directory ];
-  testHaskellDepends = [ base deepseq directory nanospec temporary ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/silently";
-  description = "Prevent or capture writing to stdout and other handles";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/simple-reflect.nix b/pkgs/simple-reflect.nix
deleted file mode 100644
index 0be2bd9da87f2a4bdd05beff8bb573181f7409ed..0000000000000000000000000000000000000000
--- a/pkgs/simple-reflect.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "simple-reflect";
-  version = "0.3.3";
-  sha256 = "07825ea04c135298008cf080133e3bfc8e04cbacd24719c46ac6a2ca4acfdb2b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
-  description = "Simple reflection of expressions containing variables";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/simple-sendfile.nix b/pkgs/simple-sendfile.nix
deleted file mode 100644
index fecdb841b1aa7495274811c3726fdf9122a9e335..0000000000000000000000000000000000000000
--- a/pkgs/simple-sendfile.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, conduit, conduit-extra
-, directory, hspec, hspec-discover, lib, network, process
-, resourcet, unix
-}:
-mkDerivation {
-  pname = "simple-sendfile";
-  version = "0.2.31";
-  sha256 = "66076e220e3ae707bc5c6df727b3279000e2fdd1c3a4f1e0bf9b715eb76dc560";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring network unix ];
-  testHaskellDepends = [
-    base bytestring conduit conduit-extra directory hspec HUnit network
-    process resourcet unix
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Cross platform library for the sendfile system call";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/singleton-bool.nix b/pkgs/singleton-bool.nix
index 4499479384afb42b0ab1f1bfdf426081a2cad8df..d595e247c033b788df2a1ec04d96c09251f18485 100644
--- a/pkgs/singleton-bool.nix
+++ b/pkgs/singleton-bool.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "singleton-bool";
   version = "0.1.7";
   sha256 = "1c2d196386c3697e884fcc8bef530506045a4860a5f669cc8416358b473bb29b";
+  revision = "1";
+  editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/singletons-th.nix b/pkgs/singletons-th.nix
deleted file mode 100644
index 54cac0d40d4a24e06c752875e8bf306000a0c04d..0000000000000000000000000000000000000000
--- a/pkgs/singletons-th.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, containers, ghc-boot-th, lib, mtl, singletons
-, syb, template-haskell, th-desugar, th-orphans, transformers
-}:
-mkDerivation {
-  pname = "singletons-th";
-  version = "3.1.1";
-  sha256 = "466b91be35ee07bc06f5bf01d15f4bd9dc99a1151deb09ee114d99b9e052e9ae";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-boot-th mtl singletons syb template-haskell
-    th-desugar th-orphans transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.github.com/goldfirere/singletons";
-  description = "A framework for generating singleton types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/singletons.nix b/pkgs/singletons.nix
index 89e5225db27dba048880156588c7117e24498c63..5a1be02e62b4ea052ccb1490e25e0008891ba823 100644
--- a/pkgs/singletons.nix
+++ b/pkgs/singletons.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "singletons";
   version = "3.0.2";
   sha256 = "f568ee129ef6438a4325f145f17fa4a3074b3564c72fd35ba1f68dcee14d5e82";
-  revision = "1";
-  editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy";
+  revision = "2";
+  editedCabalFile = "040hwa1r4vx64v62ffw2nfn29h91ns082zqc47jsp5ciwl69821p";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/size-based.nix b/pkgs/size-based.nix
index 97b25a36c2c690f78942fb05b0afa92fed160416..acc33e2845bc0e3ffa7450ca9c0c3ed695c4b04d 100644
--- a/pkgs/size-based.nix
+++ b/pkgs/size-based.nix
@@ -3,10 +3,8 @@
 }:
 mkDerivation {
   pname = "size-based";
-  version = "0.1.3.1";
-  sha256 = "a249a75341d2c54736a3a665fc7af1d2ef3c20942e52966337973d4978445ff4";
-  revision = "1";
-  editedCabalFile = "1fmqqnf3b3pjcs4h68r8ry8qci9gcl2ccwifn3dxribcm8c0n3lp";
+  version = "0.1.3.2";
+  sha256 = "8250a66565a33e3d6c7f85a1ddfc851c96b3de790473644c84a6823de55502e2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/skylighting-core.nix b/pkgs/skylighting-core.nix
index 0d7f30be4c8320075004f7a5e0a0fd090d8b22ea..b68fa81958ef1d54b2fcaebf2345e1d5bdcba16c 100644
--- a/pkgs/skylighting-core.nix
+++ b/pkgs/skylighting-core.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "skylighting-core";
-  version = "0.13.2.1";
-  sha256 = "a480809ced173d6572b349a1874a16ff74b42501e4486e4180b41e27024f65c5";
+  version = "0.14";
+  sha256 = "1223bd508d2e8dbd98db371c8ebbbe70449856d984934f54fa33d3040fe8cb91";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/skylighting-format-blaze-html.nix b/pkgs/skylighting-format-blaze-html.nix
index ff0489b3d4a41e9df3a9d142e9d317cad807d676..ff76db6b9106d4ce74a9a156364a1e50a7c2449e 100644
--- a/pkgs/skylighting-format-blaze-html.nix
+++ b/pkgs/skylighting-format-blaze-html.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "skylighting-format-blaze-html";
-  version = "0.1.1";
-  sha256 = "b1139b4df369de93d1ec6d8a2ed02bf11d559f9eaf71c31434fb5b19ba48ef13";
+  version = "0.1.1.1";
+  sha256 = "8eec82eb8535e4e1c2887d3b83a6ffd8866a0cffac4aa0e50ea229a175415791";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/skylighting.nix b/pkgs/skylighting.nix
index 04a0d35913af9c4ee3635ef159e6905a2b2f8042..f42d94f1ac347965b24b924395cdddc12c7d9801 100644
--- a/pkgs/skylighting.nix
+++ b/pkgs/skylighting.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "skylighting";
-  version = "0.13.2.1";
-  sha256 = "f074b2d8a228dbadddc026939e1e76a3c06c1f650c41a154bee3dcb615430653";
+  version = "0.14";
+  sha256 = "ffa6cd93a645d259cf9b04e5751ffcb7c045a8452ef3c4e2512365126fae7ca7";
   configureFlags = [ "-fexecutable" ];
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/smallcheck.nix b/pkgs/smallcheck.nix
deleted file mode 100644
index c170090717bdcdf90552cd2c627bff2bbf783b7d..0000000000000000000000000000000000000000
--- a/pkgs/smallcheck.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, lib, logict, mtl, pretty }:
-mkDerivation {
-  pname = "smallcheck";
-  version = "1.2.1";
-  sha256 = "e41f9d11b50e0526dd28c9bc6cf6dddf98cebd782911a00c3e5cbe4ce53fc869";
-  revision = "1";
-  editedCabalFile = "141lvb58hy94gywchaaf2dbh1dncnj951q5l6xkg1drvm94dvj1b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base logict mtl pretty ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Bodigrim/smallcheck";
-  description = "A property-based testing library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/snap-core.nix b/pkgs/snap-core.nix
index d6db0da6b86bafb9d715e175b098b78613389731..aadd8f5c0cd09a63091e763121214d9587bd68cd 100644
--- a/pkgs/snap-core.nix
+++ b/pkgs/snap-core.nix
@@ -11,8 +11,8 @@ mkDerivation {
   pname = "snap-core";
   version = "1.0.5.1";
   sha256 = "a704c1a0e2c4ebfdcc8baf6feab09dd7715bdc9d750f7efb63d06e3965ec0502";
-  revision = "1";
-  editedCabalFile = "1hmkk9gxvrrs6ddf7l8i6ajdgdw4zgd103al67ggrh7whjyg2i0d";
+  revision = "3";
+  editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/snap-server.nix b/pkgs/snap-server.nix
index aa04421871f9d9e4d0155c0b2fb7bd44ddccd1fd..62633d2d6a9197362db64e65cc754e346fb35a4c 100644
--- a/pkgs/snap-server.nix
+++ b/pkgs/snap-server.nix
@@ -11,8 +11,8 @@ mkDerivation {
   pname = "snap-server";
   version = "1.1.2.1";
   sha256 = "a47457fd746db202711b6a6b34a8575daa291a01a99cd0900e639aadc06fca7e";
-  revision = "1";
-  editedCabalFile = "09ljp1m8lv2khp6m76sj96qa3gr5v19c5caz54jlvinj7k6bhhfm";
+  revision = "3";
+  editedCabalFile = "0adjcah7hx47cg066jbjjgn7wz8pvkm0fc87fyz8c7lc0sdmp84f";
   configureFlags = [ "-fopenssl" ];
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/socks.nix b/pkgs/socks.nix
deleted file mode 100644
index 63c9ac6e32912be5227e6a9178a64c247d778e6d..0000000000000000000000000000000000000000
--- a/pkgs/socks.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, basement, bytestring, cereal, lib, network }:
-mkDerivation {
-  pname = "socks";
-  version = "0.6.1";
-  sha256 = "734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base basement bytestring cereal network
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-socks";
-  description = "Socks proxy (ver 5)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/some.nix b/pkgs/some.nix
deleted file mode 100644
index 84405e83ffb3d726bf072793bcad276cd3dd307d..0000000000000000000000000000000000000000
--- a/pkgs/some.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "some";
-  version = "1.0.5";
-  sha256 = "b0de79de39b5e02bbef673ed8af2a81cb9184a7fe5eb978e4bb0d906fddc915f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  testHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/some";
-  description = "Existential type: Some";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sop-core.nix b/pkgs/sop-core.nix
index 137498296ce35a99bcc6a9b6918d69185a3e4897..c96b779ce61d5077500fde5845ec6d78597ff4de 100644
--- a/pkgs/sop-core.nix
+++ b/pkgs/sop-core.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "sop-core";
   version = "0.5.0.2";
   sha256 = "87bffd2254b98ded822d449fcd1c33dbd74d2ce96bf35e7a6714abc5a2297265";
-  revision = "2";
-  editedCabalFile = "0db36xhswrsc30cw5c5s7h6g1ykcb3bkjjnixaqqshxln6cwfsig";
+  revision = "3";
+  editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/sorted-list.nix b/pkgs/sorted-list.nix
index 7c00cb8f2ebbd4612870fe1611aab25e3b8189ee..de05708d9e514226e3704789951c3d2a01ee4b98 100644
--- a/pkgs/sorted-list.nix
+++ b/pkgs/sorted-list.nix
@@ -1,12 +1,13 @@
-{ mkDerivation, base, criterion, deepseq, lib }:
+{ mkDerivation, QuickCheck, base, criterion, deepseq, lib }:
 mkDerivation {
   pname = "sorted-list";
-  version = "0.2.1.0";
-  sha256 = "b4e476157cf0df745eb3c39921357ffb2bf411cd169e755e99536031e07c5ef4";
+  version = "0.2.2.0";
+  sha256 = "39e70f76a621bd23992e69b5140d76502eaa602e31d2c2f8493fcdda5d980f37";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ];
+  testHaskellDepends = [ base QuickCheck ];
   benchmarkHaskellDepends = [ base criterion ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -15,7 +16,6 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
   description = "Type-enforced sorted lists and related functions";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/special-values.nix b/pkgs/special-values.nix
deleted file mode 100644
index a0c323319aac6b93edd49e291c238602bdf06f47..0000000000000000000000000000000000000000
--- a/pkgs/special-values.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, bytestring, ieee754, lib, scientific, text }:
-mkDerivation {
-  pname = "special-values";
-  version = "0.1.0.0";
-  sha256 = "3c14dd1304dacc8e54c2dcf95ebb3bb74b172b5409b9b45352108a4698e06dce";
-  revision = "2";
-  editedCabalFile = "1vv5gydjd65jniifl3mnch8bzvpvdahi913gsa3kv5zijwhad699";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring ieee754 scientific text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/minad/special-values#readme";
-  description = "Typeclass providing special values";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/splitmix.nix b/pkgs/splitmix.nix
deleted file mode 100644
index 25381004710cc24ed273cc6ddff85dc8dfebf091..0000000000000000000000000000000000000000
--- a/pkgs/splitmix.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, HUnit, async, base, base-compat
-, base-compat-batteries, bytestring, clock, containers, criterion
-, deepseq, lib, math-functions, process, random, test-framework
-, test-framework-hunit, testu01, tf-random, vector
-}:
-mkDerivation {
-  pname = "splitmix";
-  version = "0.1.0.4";
-  sha256 = "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa";
-  revision = "2";
-  editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  testHaskellDepends = [
-    async base base-compat base-compat-batteries bytestring containers
-    deepseq HUnit math-functions process random test-framework
-    test-framework-hunit tf-random vector
-  ];
-  testSystemDepends = [ testu01 ];
-  benchmarkHaskellDepends = [
-    base clock containers criterion random tf-random
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Fast Splittable PRNG";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/spoon.nix b/pkgs/spoon.nix
deleted file mode 100644
index 680f8451eb7fd80804927873bf3d94146d8b8067..0000000000000000000000000000000000000000
--- a/pkgs/spoon.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "spoon";
-  version = "0.3.1";
-  sha256 = "b9b350b6730e34c246bbf7e228a86b3d4925b52c95542f7676d719ef2a9881d4";
-  revision = "1";
-  editedCabalFile = "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Catch errors thrown from pure computations";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/statestack.nix b/pkgs/statestack.nix
index f3693bbd7b6f4ff11b4d8550b067022b6897e39e..04ab4c5030d2c504ffbee9457798d36ee0e8db86 100644
--- a/pkgs/statestack.nix
+++ b/pkgs/statestack.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "statestack";
   version = "0.3.1.1";
   sha256 = "cd55733032b34d671852c7b6d05c1645cea2f280ac35221d480cf721d5c7879c";
+  revision = "1";
+  editedCabalFile = "0rxndmrq4gj1bc9cf20477n8d6kpri31dyl6x8f4h57yiwhblg55";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix
index b66359cb716b43f5280b20eb76809b7de4dabfd1..3615e76c181fa82ff9028f6fdbe842062f47bc68 100644
--- a/pkgs/statistics.nix
+++ b/pkgs/statistics.nix
@@ -7,8 +7,8 @@
 }:
 mkDerivation {
   pname = "statistics";
-  version = "0.16.2.0";
-  sha256 = "b335df6c1f3f53f1da19ed06bdb76474cb5ffd6fd18f7c3639f2148342a058bf";
+  version = "0.16.2.1";
+  sha256 = "a7c0c068a0d1f784d865163748a40fbbdda48febe3b905063a22ce7a32e05ce4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/stm-containers.nix b/pkgs/stm-containers.nix
index 25cd789a6d38d2fc9260ccc87b4acff1bc3a346d..77bc2045020689a3eb350ebf1ca9af4d6167a4ab 100644
--- a/pkgs/stm-containers.nix
+++ b/pkgs/stm-containers.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "stm-containers";
-  version = "1.2.0.2";
-  sha256 = "ad2df570b76e0e5b5d5df69080a53b5167832d624a6954acdca6a706f9813ea4";
+  version = "1.2.0.3";
+  sha256 = "928cbcbcd8300e16cda4f2042d9fff2cbc89feec4ea95e901e38f6e9a5f690b1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/stm-hamt.nix b/pkgs/stm-hamt.nix
index 2168f01456267c272e069da1436453ef4700e25f..c3439daedccdf3d2a26c35e95d03ad2a7c5fbbd3 100644
--- a/pkgs/stm-hamt.nix
+++ b/pkgs/stm-hamt.nix
@@ -1,12 +1,12 @@
 { mkDerivation, QuickCheck, async, base, criterion, deferred-folds
-, focus, free, hashable, lib, list-t, mwc-random-monad, primitive
-, primitive-extras, quickcheck-instances, rebase, rerebase, tasty
+, focus, free, hashable, lib, list-t, primitive, primitive-extras
+, quickcheck-instances, random, rebase, rerebase, tasty
 , tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "stm-hamt";
-  version = "1.2.0.11";
-  sha256 = "725c11d46a7e436789e0add1ec4413ab899733e494afd8bced8bb7c474de8537";
+  version = "1.2.0.14";
+  sha256 = "ad4b4badc608cb8a4befdf0b5304932b4eb9a1fe27640488ed03f7e17db31866";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,7 +19,7 @@ mkDerivation {
     tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    async criterion focus free mwc-random-monad rebase
+    async criterion focus free random rebase
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/storable-record.nix b/pkgs/storable-record.nix
deleted file mode 100644
index 0233703c5324a22afa631ddd74e56e47621f3bb6..0000000000000000000000000000000000000000
--- a/pkgs/storable-record.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, QuickCheck, base, lib, semigroups, transformers
-, utility-ht
-}:
-mkDerivation {
-  pname = "storable-record";
-  version = "0.0.7";
-  sha256 = "bec546c894d39182af50415743af226456a5f79da281d1a3c0b7db11362a2eb0";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base QuickCheck semigroups transformers utility-ht
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://code.haskell.org/~thielema/storable-record/";
-  description = "Elegant definition of Storable instances for records";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/storable-tuple.nix b/pkgs/storable-tuple.nix
deleted file mode 100644
index 0770903e08594be85e2f0e373d143d0a1aad46c0..0000000000000000000000000000000000000000
--- a/pkgs/storable-tuple.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, base-orphans, lib, storable-record
-, utility-ht
-}:
-mkDerivation {
-  pname = "storable-tuple";
-  version = "0.1";
-  sha256 = "034b4fa44239d60326af52fecde604ba65ef1f75cfd5cef1ded2079a3b86593c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans storable-record utility-ht
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://code.haskell.org/~thielema/storable-tuple/";
-  description = "Storable instance for pairs and triples";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/store-core.nix b/pkgs/store-core.nix
deleted file mode 100644
index 338dc679816f2992e77fc008cca7e2848f2a7e24..0000000000000000000000000000000000000000
--- a/pkgs/store-core.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, ghc-prim, lib, primitive, text
-, transformers
-}:
-mkDerivation {
-  pname = "store-core";
-  version = "0.4.4.4";
-  sha256 = "1e204ffb4c494808ac64bec2381f2a2c4d18fac70ad325559a7cc11bcae54140";
-  revision = "1";
-  editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring ghc-prim primitive text transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/store#readme";
-  description = "Fast and lightweight binary serialization";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/store.nix b/pkgs/store.nix
deleted file mode 100644
index 9c0a66e71cdad4379a975093ea9e3fc8bd4ea3f9..0000000000000000000000000000000000000000
--- a/pkgs/store.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ mkDerivation, array, async, base, base-orphans, base64-bytestring
-, bifunctors, bytestring, cereal, cereal-vector, clock, containers
-, contravariant, criterion, cryptohash, deepseq, directory
-, filepath, free, ghc-prim, hashable, hspec, hspec-discover
-, hspec-smallcheck, integer-gmp, lib, lifted-base, monad-control
-, mono-traversable, nats, network, primitive, resourcet, safe
-, smallcheck, store-core, syb, template-haskell, text, th-lift
-, th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-, transformers, unordered-containers, vector
-, vector-binary-instances, void, weigh
-}:
-mkDerivation {
-  pname = "store";
-  version = "0.7.16";
-  sha256 = "4f7fc5853e17f0703165d0c3dc28b24fd7e09b7720123faf3fd33389994cb688";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array async base base-orphans base64-bytestring bifunctors
-    bytestring containers contravariant cryptohash deepseq directory
-    filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-    lifted-base monad-control mono-traversable nats network primitive
-    resourcet safe smallcheck store-core syb template-haskell text
-    th-lift th-lift-instances th-orphans th-reify-many th-utilities
-    time transformers unordered-containers vector void
-  ];
-  testHaskellDepends = [
-    array async base base-orphans base64-bytestring bifunctors
-    bytestring clock containers contravariant cryptohash deepseq
-    directory filepath free ghc-prim hashable hspec hspec-smallcheck
-    integer-gmp lifted-base monad-control mono-traversable nats network
-    primitive resourcet safe smallcheck store-core syb template-haskell
-    text th-lift th-lift-instances th-orphans th-reify-many
-    th-utilities time transformers unordered-containers vector void
-  ];
-  testToolDepends = [ hspec-discover ];
-  benchmarkHaskellDepends = [
-    array async base base-orphans base64-bytestring bifunctors
-    bytestring cereal cereal-vector containers contravariant criterion
-    cryptohash deepseq directory filepath free ghc-prim hashable hspec
-    hspec-smallcheck integer-gmp lifted-base monad-control
-    mono-traversable nats network primitive resourcet safe smallcheck
-    store-core syb template-haskell text th-lift th-lift-instances
-    th-orphans th-reify-many th-utilities time transformers
-    unordered-containers vector vector-binary-instances void weigh
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mgsloan/store#readme";
-  description = "Fast binary serialization";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/streaming-bytestring.nix b/pkgs/streaming-bytestring.nix
index 50813bc9a1f32348b5efb1f605abfe385a768e0a..b582968b1df713fddb0608bb28b2c53a6889a248 100644
--- a/pkgs/streaming-bytestring.nix
+++ b/pkgs/streaming-bytestring.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "streaming-bytestring";
-  version = "0.3.0";
-  sha256 = "51e4451745b7e110c0a1852b4b2c457da222fddc5576f48380e0dfd5aa501d58";
+  version = "0.3.1";
+  sha256 = "62c472974bebc5a23c684d189335f1375e2a3fbd43c8ea1cfc69821c14d2065e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/streaming-commons.nix b/pkgs/streaming-commons.nix
deleted file mode 100644
index 413e8dc6448fa07e9d37b0a8c6b04413a031d32b..0000000000000000000000000000000000000000
--- a/pkgs/streaming-commons.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, array, async, base, bytestring, deepseq
-, directory, gauge, hspec, hspec-discover, lib, network, process
-, random, stm, text, transformers, unix, zlib
-}:
-mkDerivation {
-  pname = "streaming-commons";
-  version = "0.2.2.6";
-  sha256 = "0180958a882eb0f6262b812fe886c2b1b8285474b5b958f814ae4f05409fbf79";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array async base bytestring directory network process random stm
-    text transformers unix zlib
-  ];
-  testHaskellDepends = [
-    array async base bytestring deepseq hspec network QuickCheck text
-    unix zlib
-  ];
-  testToolDepends = [ hspec-discover ];
-  benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/streaming-commons";
-  description = "Common lower-level functions needed by various streaming data libraries";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/strict-list.nix b/pkgs/strict-list.nix
index 283201ee2b58c285a7e844c8fc8700acd8bc3a98..41e9c9c2b2ae769d2e0a82aa64b91196757bf094 100644
--- a/pkgs/strict-list.nix
+++ b/pkgs/strict-list.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "strict-list";
-  version = "0.1.7.1";
-  sha256 = "81050df562928f71918f0f8c0f0541bf87c3d5a820c250a5b0e5992e99f37faf";
+  version = "0.1.7.2";
+  sha256 = "7dd3dad05ea79cbdb8b4d47bb9d4cde4c210d38674ba00cc959291cddf85f9ff";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/strict.nix b/pkgs/strict.nix
deleted file mode 100644
index cbdbcef7f045b26654a254ee1637a36561e32110..0000000000000000000000000000000000000000
--- a/pkgs/strict.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, assoc, base, binary, bytestring, deepseq, ghc-prim
-, hashable, lib, text, these, transformers
-}:
-mkDerivation {
-  pname = "strict";
-  version = "0.5";
-  sha256 = "3f4f0995dec2d520d0e321542f71412dac023658fdab603db04364d75269a0fd";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    assoc base binary bytestring deepseq ghc-prim hashable text these
-    transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-strict/strict";
-  description = "Strict data types and String IO";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/string-qq.nix b/pkgs/string-qq.nix
deleted file mode 100644
index 994160d1d950268031099aacf549ae8d08236fdb..0000000000000000000000000000000000000000
--- a/pkgs/string-qq.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, HUnit, base, lib, template-haskell, text }:
-mkDerivation {
-  pname = "string-qq";
-  version = "0.0.4";
-  sha256 = "c85b9c1e27596ea8e765e4b630b7be53c331c51b680ad46cc2d248d3099fdd71";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [ base HUnit text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-  license = lib.licenses.publicDomain;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/stringbuilder.nix b/pkgs/stringbuilder.nix
deleted file mode 100644
index 4fd4949cb2be4249052e9e5679dd5095ac837e6a..0000000000000000000000000000000000000000
--- a/pkgs/stringbuilder.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, QuickCheck, base, hspec, lib }:
-mkDerivation {
-  pname = "stringbuilder";
-  version = "0.5.1";
-  sha256 = "d878bdc4da806dbce5ab684ef13d2634c17c15b991d0ed3bb25a331eba6603ba";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A writer monad for multi-line string literals";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/svg-builder.nix b/pkgs/svg-builder.nix
index 9b83d7a673147443bf7bd3d28cca41427ef72db2..7a3982f68bbac24f0684cf0c50843fc0dcc42381 100644
--- a/pkgs/svg-builder.nix
+++ b/pkgs/svg-builder.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "svg-builder";
   version = "0.1.1";
   sha256 = "4fd0e3f2cbc5601fc69e7eab41588cbfa1150dc508d9d86bf5f3d393880382cc";
-  revision = "6";
-  editedCabalFile = "1cprm8ya1rdid4pz1dk6692mv0kqkaxrsqaxg83bca5z4dkgqi2z";
+  revision = "7";
+  editedCabalFile = "0fjbparishw3b2gnh3i7b3d3vxf7mp8h17sfawkf2333smb9zl47";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/syb.nix b/pkgs/syb.nix
deleted file mode 100644
index 3ed0f7a456c204d32dcf68c492bb62f81569c8a9..0000000000000000000000000000000000000000
--- a/pkgs/syb.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, containers, lib, mtl, tasty, tasty-hunit }:
-mkDerivation {
-  pname = "syb";
-  version = "0.7.2.3";
-  sha256 = "d0b72daf16a947c4d9cb2d5774072f2153433224a04fd60fad60be9ffac8d91a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-  description = "Scrap Your Boilerplate";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sydtest-discover.nix b/pkgs/sydtest-discover.nix
deleted file mode 100644
index 6041e449594c0eb993c0a2bedbf138eb20f0ae1d..0000000000000000000000000000000000000000
--- a/pkgs/sydtest-discover.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, filepath, lib, optparse-applicative, path
-, path-io
-}:
-mkDerivation {
-  pname = "sydtest-discover";
-  version = "0.0.0.2";
-  sha256 = "fbc0b1a7bae9a40e9aec7bda706c11f6bb6cbefc840ad2ee350380cb925459d9";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base filepath optparse-applicative path path-io
-  ];
-  executableHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/sydtest#readme";
-  description = "Automatic test suite discovery for sydtest";
-  license = "unknown";
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/sydtest.nix b/pkgs/sydtest.nix
deleted file mode 100644
index c81c174dd953440ee7f54ee4f6902e4ce85c014c..0000000000000000000000000000000000000000
--- a/pkgs/sydtest.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, MonadRandom, QuickCheck, async, autodocodec
-, autodocodec-yaml, base, bytestring, containers, dlist, envparse
-, filepath, lib, mtl, optparse-applicative, path, path-io
-, pretty-show, quickcheck-io, random, random-shuffle, safe
-, safe-coloured-text, safe-coloured-text-terminfo, stm
-, sydtest-discover, text, vector
-}:
-mkDerivation {
-  pname = "sydtest";
-  version = "0.13.0.3";
-  sha256 = "d17ca944da56d7dfd81e58bedee09242211056b382fb0b581520b35e20164b36";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async autodocodec autodocodec-yaml base bytestring containers dlist
-    envparse filepath MonadRandom mtl optparse-applicative path path-io
-    pretty-show QuickCheck quickcheck-io random random-shuffle safe
-    safe-coloured-text safe-coloured-text-terminfo stm text vector
-  ];
-  testHaskellDepends = [
-    base bytestring path path-io QuickCheck random safe-coloured-text
-    stm text vector
-  ];
-  testToolDepends = [ sydtest-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/sydtest#readme";
-  description = "A modern testing framework for Haskell with good defaults and advanced testing features";
-  license = "unknown";
-  broken = false;
-}
diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix
index 02e7d36a7988a6aaee247fa89b54d216243e3f77..556b8169b39e9937e455e0067f4d46d2fcd23862 100644
--- a/pkgs/system-filepath.nix
+++ b/pkgs/system-filepath.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "system-filepath";
   version = "0.4.14";
   sha256 = "1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993";
-  revision = "1";
-  editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8";
+  revision = "2";
+  editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/tabular.nix b/pkgs/tabular.nix
deleted file mode 100644
index af9bb3163991b69ab46b614af6c5350e36c398f2..0000000000000000000000000000000000000000
--- a/pkgs/tabular.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, csv, html, lib, mtl }:
-mkDerivation {
-  pname = "tabular";
-  version = "0.2.2.8";
-  sha256 = "cb7d06eaec7945cd77db2380ed4a9b7a048c5f6abcfba766c328228be033237d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base csv html mtl ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/bgamari/tabular";
-  description = "Two-dimensional data tables with rendering functions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tagged.nix b/pkgs/tagged.nix
deleted file mode 100644
index b13e78ee7738e6b9b5f9f6953dc3e47f192015f9..0000000000000000000000000000000000000000
--- a/pkgs/tagged.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, deepseq, lib, template-haskell, transformers
-}:
-mkDerivation {
-  pname = "tagged";
-  version = "0.8.7";
-  sha256 = "6414eeac27a1633f49e2f78199ced99ce8ce3d70b658cf6d55b1d81ff60cb961";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq template-haskell transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/tagged";
-  description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tar.nix b/pkgs/tar.nix
deleted file mode 100644
index b64c1d1df5459b9ce14a6a8de52c1c25fe140b29..0000000000000000000000000000000000000000
--- a/pkgs/tar.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, bytestring, containers
-, deepseq, directory, fetchgit, filepath, lib, tasty, tasty-bench
-, tasty-quickcheck, time
-}:
-mkDerivation {
-  pname = "tar";
-  version = "0.6.0.0";
-  src = fetchgit {
-    url = "https://github.com/locallycompact/tar";
-    sha256 = "1602fyzgsf5i6lrl6jv8x00qdbm37025ms87ncl7b30dcj2dvqh7";
-    rev = "107c0b78524acfd0e77e767b83073492008bea0c";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring containers deepseq directory filepath time
-  ];
-  testHaskellDepends = [
-    array base bytestring containers deepseq directory filepath
-    QuickCheck tasty tasty-quickcheck time
-  ];
-  benchmarkHaskellDepends = [
-    array base bytestring containers deepseq directory filepath
-    tasty-bench time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Reading, writing and manipulating \".tar\" archive files.";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-bench.nix b/pkgs/tasty-bench.nix
deleted file mode 100644
index a17abb929d11e4d4b0354c93d2622342a30521ac..0000000000000000000000000000000000000000
--- a/pkgs/tasty-bench.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, containers, deepseq, ghc-prim, lib, tasty }:
-mkDerivation {
-  pname = "tasty-bench";
-  version = "0.3.4";
-  sha256 = "4de671ebafafe5cba7ba14a4503f25ac080a8eedc4e9f815b5cb3ba8f8a9ce1e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ];
-  benchmarkHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Bodigrim/tasty-bench";
-  description = "Featherlight benchmark framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-expected-failure.nix b/pkgs/tasty-expected-failure.nix
deleted file mode 100644
index 4fe37955ef01a5909c2a33bb8d744c483cd7d5ab..0000000000000000000000000000000000000000
--- a/pkgs/tasty-expected-failure.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, hedgehog, lib, tagged, tasty, tasty-golden
-, tasty-hedgehog, tasty-hunit, unbounded-delays
-}:
-mkDerivation {
-  pname = "tasty-expected-failure";
-  version = "0.12.3";
-  sha256 = "cb07cc5ca62a6fd673ef54ae70b4bc5f9c12662fe835bea1f38b944684ee8f7e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base tagged tasty unbounded-delays ];
-  testHaskellDepends = [
-    base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/nomeata/tasty-expected-failure";
-  description = "Mark tasty tests as failure expected";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-golden.nix b/pkgs/tasty-golden.nix
deleted file mode 100644
index cd31975c5b4870a90dd0431e7b55a0038fdeb5fa..0000000000000000000000000000000000000000
--- a/pkgs/tasty-golden.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, async, base, bytestring, containers, deepseq
-, directory, filepath, lib, mtl, optparse-applicative, tagged
-, tasty, tasty-hunit, temporary, text, typed-process
-}:
-mkDerivation {
-  pname = "tasty-golden";
-  version = "2.3.5";
-  sha256 = "8b37b541a2603da27e88fcf3209118817e978a36187142dda160b39c6cb7740e";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base bytestring containers deepseq directory filepath mtl
-    optparse-applicative tagged tasty temporary text typed-process
-  ];
-  testHaskellDepends = [
-    base directory filepath tasty tasty-hunit temporary typed-process
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/tasty-golden";
-  description = "Golden tests support for tasty";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-hedgehog.nix b/pkgs/tasty-hedgehog.nix
deleted file mode 100644
index 7908b4580e6797eb56fd9b229fab8f31e6358d2b..0000000000000000000000000000000000000000
--- a/pkgs/tasty-hedgehog.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, hedgehog, lib, tagged, tasty
-, tasty-expected-failure
-}:
-mkDerivation {
-  pname = "tasty-hedgehog";
-  version = "1.4.0.1";
-  sha256 = "c8ad782115f5068c3a1749960db6ca32a41c981369dc05710f13825af12eddee";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hedgehog tagged tasty ];
-  testHaskellDepends = [
-    base hedgehog tasty tasty-expected-failure
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/qfpl/tasty-hedgehog";
-  description = "Integration for tasty and hedgehog";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-hspec.nix b/pkgs/tasty-hspec.nix
index a072bacc2f28d90ceb836bdd293bbaa98412ee5a..db49d56591be97e6ab19ac291fdc4bbb2ad1e1e7 100644
--- a/pkgs/tasty-hspec.nix
+++ b/pkgs/tasty-hspec.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, QuickCheck, base, hspec, hspec-core, lib, tasty
-, tasty-quickcheck, tasty-smallcheck
+{ mkDerivation, QuickCheck, base, hspec, hspec-api, hspec-core, lib
+, tasty, tasty-quickcheck, tasty-smallcheck
 }:
 mkDerivation {
   pname = "tasty-hspec";
-  version = "1.2.0.3";
-  sha256 = "9d5d6febcf5f723ecee79a088d13f8550297aead959ca6e52d5b03a598de0d94";
-  revision = "1";
-  editedCabalFile = "01sc5gmij3280b63jpjcz0a2lq045dj5ay46yq9i896cyka6gs6r";
+  version = "1.2.0.4";
+  sha256 = "d1a273cbe653c23422c14e99672f7cd64e07f85bb019f95fef095db8e5b461c2";
+  revision = "2";
+  editedCabalFile = "17q4xwj2glc8d482r33kq472yhkx7nai987x80nw3ilmp942bxzd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base hspec hspec-core QuickCheck tasty tasty-quickcheck
+    base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck
     tasty-smallcheck
   ];
   enableLibraryProfiling = true;
diff --git a/pkgs/tasty-hunit.nix b/pkgs/tasty-hunit.nix
deleted file mode 100644
index 31f73555d6ae16a0fc8edce046589804518ff4d3..0000000000000000000000000000000000000000
--- a/pkgs/tasty-hunit.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, call-stack, fetchgit, lib, tasty }:
-mkDerivation {
-  pname = "tasty-hunit";
-  version = "0.10.0.2";
-  src = fetchgit {
-    url = "https://github.com/UnkindPartition/tasty";
-    sha256 = "0xx85l6g6xxxyfjmlxz5mfli75v77js55a9hr0n7ghrypg2lpj55";
-    rev = "226c35f468be389536fbb9471904a113d1586da6";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/hunit/; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base call-stack tasty ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/tasty";
-  description = "HUnit support for the Tasty test framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-inspection-testing.nix b/pkgs/tasty-inspection-testing.nix
deleted file mode 100644
index 88e9ae48beda91fb7974c5085ad97314231388bf..0000000000000000000000000000000000000000
--- a/pkgs/tasty-inspection-testing.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, ghc, inspection-testing, lib, tasty
-, template-haskell
-}:
-mkDerivation {
-  pname = "tasty-inspection-testing";
-  version = "0.2";
-  sha256 = "1f8fa87b808b660c1390406c134758ae269afe9bf0682394e88ebf42ca5bbcbd";
-  revision = "1";
-  editedCabalFile = "1539r8zxbpwf1ia48syslq2j5v6l8czigp4fjwfwdcsf8x5k9j6g";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base ghc inspection-testing tasty template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/Bodigrim/tasty-inspection-testing";
-  description = "Inspection testing support for tasty";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-kat.nix b/pkgs/tasty-kat.nix
deleted file mode 100644
index 53b4c5cb1bfce810095f937c9e23d704a36adfb9..0000000000000000000000000000000000000000
--- a/pkgs/tasty-kat.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, lib, mtl, tasty, tasty-hunit
-, tasty-quickcheck
-}:
-mkDerivation {
-  pname = "tasty-kat";
-  version = "0.0.3";
-  sha256 = "a72501f0f77db372648566bbba1dd1d6d0d0c975b42238875d663313e9a5db93";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring tasty ];
-  testHaskellDepends = [
-    base bytestring mtl tasty tasty-hunit tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/vincenthz/tasty-kat";
-  description = "Known Answer Tests (KAT) framework for tasty";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-quickcheck.nix b/pkgs/tasty-quickcheck.nix
deleted file mode 100644
index 5c96b671de8e09cdceebdfc843b3850119e271bf..0000000000000000000000000000000000000000
--- a/pkgs/tasty-quickcheck.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, lib, optparse-applicative
-, pcre-light, random, tagged, tasty, tasty-hunit
-}:
-mkDerivation {
-  pname = "tasty-quickcheck";
-  version = "0.10.2";
-  sha256 = "b4884c815db26a543ee1062664ee051ac89d51b2c2526d30029c6eb95b36cce2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base optparse-applicative QuickCheck random tagged tasty
-  ];
-  testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/tasty";
-  description = "QuickCheck support for the Tasty test framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-rerun.nix b/pkgs/tasty-rerun.nix
index d757d642453a4b09358bd3402729ef0d9f16faff..4dee8ecf19c08e24f289fff6cd62d739976ade18 100644
--- a/pkgs/tasty-rerun.nix
+++ b/pkgs/tasty-rerun.nix
@@ -3,10 +3,10 @@
 }:
 mkDerivation {
   pname = "tasty-rerun";
-  version = "1.1.18";
-  sha256 = "fa74ac10bc23fd3e443362427236a9c543f92b6aaf2e1bc8e959ecd47fb98c69";
-  revision = "4";
-  editedCabalFile = "1i2van23247h62sz94kjiyyb6xvz88z6kkjqqsbxi4m74pga27hn";
+  version = "1.1.19";
+  sha256 = "6f3df401f724ea0978ade8c18f8a7a5f1032ff7c5bf016885833135dbd2c7235";
+  revision = "2";
+  editedCabalFile = "01gliss91bx2xfpz4f99g82sqahir5g2rnwn531ccn8jp1m917di";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/tasty-silver.nix b/pkgs/tasty-silver.nix
deleted file mode 100644
index cc3af97b4483d3c084002b56b4120a0bf2352fde..0000000000000000000000000000000000000000
--- a/pkgs/tasty-silver.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, ansi-terminal, async, base, bytestring, containers
-, deepseq, directory, filepath, lib, mtl, optparse-applicative
-, process, process-extras, regex-tdfa, silently, stm, tagged, tasty
-, tasty-hunit, temporary, text, transformers
-}:
-mkDerivation {
-  pname = "tasty-silver";
-  version = "3.3.1.1";
-  sha256 = "35fde58705e5041671fd1009c1fa79823ffdd60bca326b054e5bc6c880fe408e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal async base bytestring containers deepseq directory
-    filepath mtl optparse-applicative process process-extras regex-tdfa
-    silently stm tagged tasty temporary text transformers
-  ];
-  testHaskellDepends = [
-    base directory filepath process silently tasty tasty-hunit
-    temporary transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phile314/tasty-silver";
-  description = "A fancy test runner, including support for golden tests";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-smallcheck.nix b/pkgs/tasty-smallcheck.nix
deleted file mode 100644
index f553a009841cf15c32b08934308454efc77e941a..0000000000000000000000000000000000000000
--- a/pkgs/tasty-smallcheck.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, lib, optparse-applicative, smallcheck, tagged
-, tasty
-}:
-mkDerivation {
-  pname = "tasty-smallcheck";
-  version = "0.8.2";
-  sha256 = "d5cbd7a2a7100e4afd3aaac01a8fa1b7814fb074d93aeff1b51240b687e54f33";
-  revision = "1";
-  editedCabalFile = "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base optparse-applicative smallcheck tagged tasty
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/feuerbach/tasty";
-  description = "SmallCheck support for the Tasty test framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-th.nix b/pkgs/tasty-th.nix
deleted file mode 100644
index 79efe551fe915590febdcdf67b9f0ad6e44919f9..0000000000000000000000000000000000000000
--- a/pkgs/tasty-th.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, haskell-src-exts, lib, tasty, tasty-hunit
-, template-haskell
-}:
-mkDerivation {
-  pname = "tasty-th";
-  version = "0.1.7";
-  sha256 = "435aac8f317e2f8cb1aa96fb3f7c9003c1ac28e6d3ca4c3c23f5142178de512c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base haskell-src-exts tasty template-haskell
-  ];
-  testHaskellDepends = [ base tasty-hunit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/bennofs/tasty-th";
-  description = "Automatic tasty test case discovery using TH";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tasty-wai.nix b/pkgs/tasty-wai.nix
index 9d88b64fedfeeddcd8b7ad49a254542e7936d7bb..b4b498015ff28adf4fd68244b4a551fd4e4de69c 100644
--- a/pkgs/tasty-wai.nix
+++ b/pkgs/tasty-wai.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "tasty-wai";
   version = "0.1.2.0";
   sha256 = "6f6f224d6dee893ce550f512832389a9ae0e490917a99b5362c9a4f73f16dca3";
-  revision = "1";
-  editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c";
+  revision = "2";
+  editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/tasty.nix b/pkgs/tasty.nix
deleted file mode 100644
index eb2ec45bbeb709a878247a37d3a6e2c784b33fb1..0000000000000000000000000000000000000000
--- a/pkgs/tasty.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, ansi-terminal, base, containers, lib
-, optparse-applicative, stm, tagged, transformers, unix
-}:
-mkDerivation {
-  pname = "tasty";
-  version = "1.4.3";
-  sha256 = "f420da9560267271dce8a0007a1cb77c06987f0d129eb0f613110ce61f71cb00";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal base containers optparse-applicative stm tagged
-    transformers unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/UnkindPartition/tasty";
-  description = "Modern and extensible testing framework";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/template-haskell-compat-v0208.nix b/pkgs/template-haskell-compat-v0208.nix
index 81198602e977816490366ffb44deda26b99d343b..f465573ec14e2a0815f8df0ea18a4335f747f2d0 100644
--- a/pkgs/template-haskell-compat-v0208.nix
+++ b/pkgs/template-haskell-compat-v0208.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, template-haskell }:
 mkDerivation {
   pname = "template-haskell-compat-v0208";
-  version = "0.1.9.2";
-  sha256 = "c009e098660f8f8720bb6962663e4d9855516b285f83c3243b73e13eff42d7e9";
+  version = "0.1.9.3";
+  sha256 = "92463b896ddc2ae13cb826e816b832958cea6bf8a8ed613b6a7854c48bbc2d62";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -15,7 +15,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208";
-  description = "A backwards compatibility layer for Template Haskell newer than 2.8";
+  description = "Backward-compatibility layer for Template Haskell newer than 2.8";
   license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/temporary.nix b/pkgs/temporary.nix
deleted file mode 100644
index c8de334c388bcf809558e2829ee0bb1b91d14387..0000000000000000000000000000000000000000
--- a/pkgs/temporary.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, base-compat, directory, exceptions, filepath
-, lib, random, tasty, tasty-hunit, transformers, unix
-}:
-mkDerivation {
-  pname = "temporary";
-  version = "1.3";
-  sha256 = "8c442993694b5ffca823ce864af95bd2841fb5264ee511c61cf48cc71d879890";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base directory exceptions filepath random transformers unix
-  ];
-  testHaskellDepends = [
-    base base-compat directory filepath tasty tasty-hunit unix
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/feuerbach/temporary";
-  description = "Portable temporary file and directory support";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/terminal-size.nix b/pkgs/terminal-size.nix
deleted file mode 100644
index 26041874bcf650cb20905959789d85bd2fb961f3..0000000000000000000000000000000000000000
--- a/pkgs/terminal-size.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "terminal-size";
-  version = "0.3.4";
-  sha256 = "b0f070d6926cdaacf3a412c5518e5c23afca1e0ed00808a5328c96e468b67f49";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Get terminal window height and width";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/test-framework-hunit.nix b/pkgs/test-framework-hunit.nix
deleted file mode 100644
index 5f948531627c7e232865797de4e36c3ef410ee84..0000000000000000000000000000000000000000
--- a/pkgs/test-framework-hunit.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, base, extensible-exceptions, lib
-, test-framework
-}:
-mkDerivation {
-  pname = "test-framework-hunit";
-  version = "0.3.0.2";
-  sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
-  revision = "3";
-  editedCabalFile = "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base extensible-exceptions HUnit test-framework
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://batterseapower.github.io/test-framework/";
-  description = "HUnit support for the test-framework package";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/test-framework-quickcheck2.nix b/pkgs/test-framework-quickcheck2.nix
deleted file mode 100644
index 7d3d5455e725afe47a3245e773873ee1a111b2a9..0000000000000000000000000000000000000000
--- a/pkgs/test-framework-quickcheck2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, extensible-exceptions, lib
-, random, test-framework
-}:
-mkDerivation {
-  pname = "test-framework-quickcheck2";
-  version = "0.3.0.5";
-  sha256 = "c9f678d4ec30599172eb887031f0bce2012b532daeb713836bd912bff64eee59";
-  revision = "3";
-  editedCabalFile = "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base extensible-exceptions QuickCheck random test-framework
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://haskell.github.io/test-framework/";
-  description = "QuickCheck-2 support for the test-framework package";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/test-framework-th.nix b/pkgs/test-framework-th.nix
deleted file mode 100644
index 438caea70b1cd22372edb162941383dbaa2fc385..0000000000000000000000000000000000000000
--- a/pkgs/test-framework-th.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, haskell-src-exts, language-haskell-extract
-, lib, regex-posix, template-haskell, test-framework
-}:
-mkDerivation {
-  pname = "test-framework-th";
-  version = "0.2.4";
-  sha256 = "8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base haskell-src-exts language-haskell-extract regex-posix
-    template-haskell test-framework
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/finnsson/test-generator";
-  description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/test-framework.nix b/pkgs/test-framework.nix
deleted file mode 100644
index 94517a127a2330a75257aaa0d78dc8bd31520755..0000000000000000000000000000000000000000
--- a/pkgs/test-framework.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, ansi-terminal, ansi-wl-pprint
-, base, bytestring, containers, hostname, lib, libxml, old-locale
-, random, regex-posix, semigroups, time, xml
-}:
-mkDerivation {
-  pname = "test-framework";
-  version = "0.8.2.0";
-  sha256 = "f5aec7a15dbcb39e951bcf6502606fd99d751197b5510f41706899aa7e660ac2";
-  revision = "8";
-  editedCabalFile = "1sal1qqvc8c1rvsqz292bniy1kr5rx6ll7z9chwsz6j2ncw5sgmg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal ansi-wl-pprint base containers hostname old-locale
-    random regex-posix time xml
-  ];
-  testHaskellDepends = [
-    ansi-terminal ansi-wl-pprint base bytestring containers hostname
-    HUnit libxml old-locale QuickCheck random regex-posix semigroups
-    time xml
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://haskell.github.io/test-framework/";
-  description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/texmath.nix b/pkgs/texmath.nix
index d205a5038accb5bd1889ed03ba6f0f295b63b00e..e0dd54f34633f0663c5f10bc3c1ba66c86c0e6d5 100644
--- a/pkgs/texmath.nix
+++ b/pkgs/texmath.nix
@@ -1,16 +1,17 @@
 { mkDerivation, base, bytestring, containers, directory, filepath
 , lib, mtl, pandoc-types, parsec, pretty-show, split, syb, tagged
-, tasty, tasty-golden, text, xml
+, tasty, tasty-golden, text, typst-symbols, xml
 }:
 mkDerivation {
   pname = "texmath";
-  version = "0.12.7.1";
-  sha256 = "7da715cf40920a3bfe42a33e22cd627f7929e7454595984f8ec02e0ef760f342";
+  version = "0.12.8.4";
+  sha256 = "fb53e9dcc559ff045ebf2e83a1fc6fc599fae59b9c43dda78145872dd8a671de";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base containers mtl pandoc-types parsec split syb text xml
+    base containers mtl pandoc-types parsec split syb text
+    typst-symbols xml
   ];
   testHaskellDepends = [
     base bytestring directory filepath pretty-show tagged tasty
diff --git a/pkgs/text-ansi.nix b/pkgs/text-ansi.nix
index e6e55191ce4bea783e5fa0a767a474ea6c24283e..813efb0c6d319506995ab1180cc1f4decb89fb30 100644
--- a/pkgs/text-ansi.nix
+++ b/pkgs/text-ansi.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, base, lib, text, text-builder }:
+{ mkDerivation, base, lib, text, text-builder-linear }:
 mkDerivation {
   pname = "text-ansi";
-  version = "0.2.1.1";
-  sha256 = "593da9413b77fbccdd0b1b6c767ec054c4c630a83d06b2da3d9e6213a26797d1";
+  version = "0.3.0.1";
+  sha256 = "0078b6e1adfb3fbbb4e241e20116829c3ede02f3906eb292ab4540c9e82f3846";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text text-builder ];
+  libraryHaskellDepends = [ base text text-builder-linear ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -14,7 +14,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/mitchellwrosen/text-ansi";
+  homepage = "https://github.com/awkward-squad/text-ansi";
   description = "Text styling for ANSI terminals";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/text-builder-dev.nix b/pkgs/text-builder-dev.nix
index f4eb68cba6581da176a83f5e7b15a58dd419eb8a..25db52363202d9d13320385c0eb3be7ac8e4b172 100644
--- a/pkgs/text-builder-dev.nix
+++ b/pkgs/text-builder-dev.nix
@@ -1,22 +1,22 @@
-{ mkDerivation, QuickCheck, base, bytestring, criterion
-, deferred-folds, isomorphism-class, lib, quickcheck-instances
-, rerebase, split, tasty, tasty-hunit, tasty-quickcheck, text
-, transformers
+{ mkDerivation, QuickCheck, base, base-compat, bytestring
+, criterion, deferred-folds, isomorphism-class, lib
+, quickcheck-classes, quickcheck-instances, rerebase, split, tasty
+, tasty-hunit, tasty-quickcheck, text, time, transformers
 }:
 mkDerivation {
   pname = "text-builder-dev";
-  version = "0.3.3.2";
-  sha256 = "f574e2219a44ba4c14ee9d373f59bee3ed9a3863082468d97bff5621a82755af";
+  version = "0.3.4.1";
+  sha256 = "813f35049e9e542129e2ed6a3eab390d6ca048f21da061a4774b59ce0fc6b324";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring deferred-folds isomorphism-class split text
-    transformers
+    base bytestring deferred-folds isomorphism-class QuickCheck
+    quickcheck-instances split text time transformers
   ];
   testHaskellDepends = [
-    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-    tasty-quickcheck
+    base-compat quickcheck-classes quickcheck-instances rerebase tasty
+    tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ criterion rerebase ];
   enableLibraryProfiling = true;
diff --git a/pkgs/text-builder-linear.nix b/pkgs/text-builder-linear.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2970fc26a52579e32c0a665671584712449bafc0
--- /dev/null
+++ b/pkgs/text-builder-linear.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, base, bytestring, lib, quote-quot, tasty
+, tasty-bench, tasty-quickcheck, text
+}:
+mkDerivation {
+  pname = "text-builder-linear";
+  version = "0.1.1.1";
+  sha256 = "f5db8c644bbb8078c77e2b0dfb279011992dcb9c14050389cdcff98f3206347b";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base bytestring quote-quot text ];
+  testHaskellDepends = [ base tasty tasty-quickcheck text ];
+  benchmarkHaskellDepends = [
+    base bytestring tasty tasty-bench text
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/Bodigrim/linear-builder";
+  description = "Builder for Text and ByteString based on linear types";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/text-builder.nix b/pkgs/text-builder.nix
index f8642723724a23e17eaec4ef078e953482efa5f7..06a7313827d4fec603b49514d17ae5da61eec9c5 100644
--- a/pkgs/text-builder.nix
+++ b/pkgs/text-builder.nix
@@ -1,18 +1,16 @@
-{ mkDerivation, QuickCheck, base, bytestring, criterion, lib
-, quickcheck-instances, rerebase, tasty, tasty-hunit
-, tasty-quickcheck, text, text-builder-dev
+{ mkDerivation, base, bytestring, criterion, lib, rerebase, tasty
+, tasty-hunit, tasty-quickcheck, text, text-builder-dev
 }:
 mkDerivation {
   pname = "text-builder";
-  version = "0.6.7";
-  sha256 = "90704ab83910db16d43aeb45e1bab1409f995e38c8c15101602eb38b9724f402";
+  version = "0.6.7.1";
+  sha256 = "23ce63494c16c731e472b754df4ec0bc46222629a4b6c44c617e49ce790d53f4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text text-builder-dev ];
   testHaskellDepends = [
-    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-    tasty-quickcheck
+    rerebase tasty tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ criterion rerebase ];
   enableLibraryProfiling = true;
@@ -23,7 +21,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/nikita-volkov/text-builder";
-  description = "An efficient strict text builder";
+  description = "Efficient strict text builder";
   license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/text-display.nix b/pkgs/text-display.nix
index 60b90654125d7600ab37cfa58b4ea7ef82f44fdd..2a2a0172902747238a4df83a881ca78a21e88227 100644
--- a/pkgs/text-display.nix
+++ b/pkgs/text-display.nix
@@ -3,10 +3,10 @@
 }:
 mkDerivation {
   pname = "text-display";
-  version = "0.0.4.0";
-  sha256 = "b63147b9551a7b6390e31c01ff05b4544fc9bf3ee7e1b1e55f8722652a4b45cc";
+  version = "0.0.5.0";
+  sha256 = "509fbe392f4bcbdfcc38db19c77144abb1111e3e07b2edefae62e97a3f55690f";
   revision = "1";
-  editedCabalFile = "181h85z49vkbirxxqh8ljh5byqz3kvbprcn8pss26bgmxhwbzp9y";
+  editedCabalFile = "0jrzqgz1gicjssjw2sg8v8i70z77vnh1w4pj39470rlijrjmxx7p";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -22,7 +22,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://hackage.haskell.org/package/text-display/docs/doc/book/Introduction.html";
+  homepage = "https://hackage.haskell.org/package/text-display-0.0.5.0/docs/doc/book/Introduction.html";
   description = "A typeclass for user-facing output";
   license = lib.licenses.mit;
   broken = false;
diff --git a/pkgs/text-icu.nix b/pkgs/text-icu.nix
index e7782495efc562671c3e4761f516b53870ec0101..bf576e386b286add622a52e1265a4ae3a3404798 100644
--- a/pkgs/text-icu.nix
+++ b/pkgs/text-icu.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "text-icu";
-  version = "0.8.0.2";
-  sha256 = "2d99aa88c0b4c7a1a4fc10e7bd0590c334f49bae81ef76c77a370254a4ce3d3b";
+  version = "0.8.0.4";
+  sha256 = "2d9f04c8e14d38a90df3196d96d39d9116edc5faf105498dd722749d659340fa";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/text-manipulate.nix b/pkgs/text-manipulate.nix
deleted file mode 100644
index cd6c9ec16eecf1ee4436ff1d2316045d8c372095..0000000000000000000000000000000000000000
--- a/pkgs/text-manipulate.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, criterion, lib, tasty, tasty-hunit, text }:
-mkDerivation {
-  pname = "text-manipulate";
-  version = "0.3.1.0";
-  sha256 = "9a67efef74bf8a0166436e11bc5b668c10a943c5454fdac3c8de366668a306bc";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [ base tasty tasty-hunit text ];
-  benchmarkHaskellDepends = [ base criterion text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/brendanhay/text-manipulate";
-  description = "Case conversion, word boundary manipulation, and textual subjugation";
-  license = lib.licenses.mpl20;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/text-metrics.nix b/pkgs/text-metrics.nix
deleted file mode 100644
index 4fc2d759d5347763b1e0ba80f60e93f35c7ce502..0000000000000000000000000000000000000000
--- a/pkgs/text-metrics.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, criterion, deepseq
-, hspec, lib, text, vector, weigh
-}:
-mkDerivation {
-  pname = "text-metrics";
-  version = "0.3.2";
-  sha256 = "bdd730a8f1ebc98a2d56edd73d94ebba6062ee1b49d4d019ffc2c37eaadd836e";
-  revision = "2";
-  editedCabalFile = "0h146i2dvv21nc5z1x9a5a9c2v5ml2kvd10krd5p5aaqpng6i1g4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers text vector ];
-  testHaskellDepends = [ base hspec QuickCheck text ];
-  benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mrkkrp/text-metrics";
-  description = "Calculate various string metrics efficiently";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/text-short.nix b/pkgs/text-short.nix
deleted file mode 100644
index 7b16d82f1d1d856ec42cc169c461947893901c30..0000000000000000000000000000000000000000
--- a/pkgs/text-short.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
-, hashable, lib, tasty, tasty-hunit, tasty-quickcheck
-, template-haskell, text
-}:
-mkDerivation {
-  pname = "text-short";
-  version = "0.1.5";
-  sha256 = "a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda";
-  revision = "2";
-  editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring deepseq ghc-prim hashable template-haskell
-    text
-  ];
-  testHaskellDepends = [
-    base binary bytestring tasty tasty-hunit tasty-quickcheck
-    template-haskell text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Memory-efficient representation of Unicode text strings";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/text-zipper.nix b/pkgs/text-zipper.nix
deleted file mode 100644
index 18f49d821f1ff252768501efc5d2324ea7d506d6..0000000000000000000000000000000000000000
--- a/pkgs/text-zipper.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, QuickCheck, base, deepseq, hspec, lib, text, vector
-}:
-mkDerivation {
-  pname = "text-zipper";
-  version = "0.13";
-  sha256 = "06521cc7c435f8e85aeb3ed3f2b872000c52087d73518de31e65bdca072a98a9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [ base deepseq text vector ];
-  testHaskellDepends = [ base hspec QuickCheck text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jtdaugherty/text-zipper/";
-  description = "A text editor zipper library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tf-random.nix b/pkgs/tf-random.nix
deleted file mode 100644
index 19a6779315820585c288432c70d435ce1584ced0..0000000000000000000000000000000000000000
--- a/pkgs/tf-random.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, lib, primitive, random, time }:
-mkDerivation {
-  pname = "tf-random";
-  version = "0.5";
-  sha256 = "2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base primitive random time ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "High-quality splittable pseudorandom number generator";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-abstraction.nix b/pkgs/th-abstraction.nix
deleted file mode 100644
index 294eb63e6894c2b95bd909ff067ce023622e1347..0000000000000000000000000000000000000000
--- a/pkgs/th-abstraction.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, containers, ghc-prim, lib, template-haskell
-}:
-mkDerivation {
-  pname = "th-abstraction";
-  version = "0.5.0.0";
-  sha256 = "8258dc3ab7188af5826e2467032b52a931a3af4d8a93d4a094210e240a8a9964";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-prim template-haskell
-  ];
-  testHaskellDepends = [ base containers template-haskell ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/glguy/th-abstraction";
-  description = "Nicer interface for reified information about data types";
-  license = lib.licenses.isc;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-compat.nix b/pkgs/th-compat.nix
deleted file mode 100644
index 60ea3ed69d04f50330fd2027e6741f44d19912b4..0000000000000000000000000000000000000000
--- a/pkgs/th-compat.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, base-compat, hspec, hspec-discover, lib, mtl
-, template-haskell
-}:
-mkDerivation {
-  pname = "th-compat";
-  version = "0.1.4";
-  sha256 = "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8";
-  revision = "2";
-  editedCabalFile = "0c0p2qy78cwhdfw0hn8g16l5xidikdk5314gam4258pk7q47rbp5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell ];
-  testHaskellDepends = [
-    base base-compat hspec mtl template-haskell
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-compat/th-compat";
-  description = "Backward- (and forward-)compatible Quote and Code types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-desugar.nix b/pkgs/th-desugar.nix
index 278b132d33b4d131c24f7a3b7e825734cc116af3..60d6f193ddc27aedea1c099d8c3ca83792343f31 100644
--- a/pkgs/th-desugar.nix
+++ b/pkgs/th-desugar.nix
@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "th-desugar";
-  version = "1.15";
-  sha256 = "179e2cddabb1af642d08e304fa24f4910ad42aae10095961a47d0c916e5ffe98";
+  version = "1.16";
+  sha256 = "4ecb87e0d361278c40a62410cdb5580029ecd630cfd2c619ce41812518868210";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,8 +14,8 @@ mkDerivation {
     template-haskell th-abstraction th-orphans transformers-compat
   ];
   testHaskellDepends = [
-    base containers hspec HUnit mtl syb template-haskell th-abstraction
-    th-orphans
+    base containers ghc-prim hspec HUnit mtl syb template-haskell
+    th-abstraction th-orphans
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/th-expand-syns.nix b/pkgs/th-expand-syns.nix
deleted file mode 100644
index 3ea3b732085567e5f6f019b9d7a34c991b7895e2..0000000000000000000000000000000000000000
--- a/pkgs/th-expand-syns.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, lib, syb, template-haskell
-, th-abstraction
-}:
-mkDerivation {
-  pname = "th-expand-syns";
-  version = "0.4.11.0";
-  sha256 = "8acd59ce73078ec6fb39f7555c4bb6cf1e49c256859c30aa8a4fda6d029bf7d0";
-  revision = "1";
-  editedCabalFile = "0kc4czr7bz5wl88fj11h02gn8fwr2azhw5z7ykil6lx7v1b42rg8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers syb template-haskell th-abstraction
-  ];
-  testHaskellDepends = [ base template-haskell th-abstraction ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/DanielSchuessler/th-expand-syns";
-  description = "Expands type synonyms in Template Haskell ASTs";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-extras.nix b/pkgs/th-extras.nix
index 48a38f47fee4dc0cb781b1e9bf767d8212e9849c..f85c076690bc1bfabf0ac8183a0574d290de8cf4 100644
--- a/pkgs/th-extras.nix
+++ b/pkgs/th-extras.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "th-extras";
   version = "0.0.0.6";
   sha256 = "02bf23940c0233a6ef6f61868e827ebd4554afe8d71cef2a1eb8e286a7f07c4a";
+  revision = "1";
+  editedCabalFile = "0v81vfgaky4bb3rh18mnb7ampwm43dba3vsngv9mb1f3z975f0ix";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/th-lift-instances.nix b/pkgs/th-lift-instances.nix
deleted file mode 100644
index 60eb1d2231a917134edf7d889b438daca3830e00..0000000000000000000000000000000000000000
--- a/pkgs/th-lift-instances.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, containers, lib
-, template-haskell, text, th-lift, transformers, vector
-}:
-mkDerivation {
-  pname = "th-lift-instances";
-  version = "0.1.20";
-  sha256 = "f533c3f95addcca461a0ccd1aafef75dd801bfa6599c0d1184d54bfffb61d870";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers template-haskell text th-lift
-    transformers vector
-  ];
-  testHaskellDepends = [
-    base bytestring containers QuickCheck template-haskell text vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/bennofs/th-lift-instances/";
-  description = "Lift instances for template-haskell for common data types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-lift.nix b/pkgs/th-lift.nix
deleted file mode 100644
index 275bbc4158e0cadba745f5b33176ffb50a57cd94..0000000000000000000000000000000000000000
--- a/pkgs/th-lift.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib, template-haskell
-, th-abstraction
-}:
-mkDerivation {
-  pname = "th-lift";
-  version = "0.8.3";
-  sha256 = "25d57bf5f8e7deefeb4ace0539805ae1e90b1ba5a034ebcc36141846408c6b75";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base ghc-prim template-haskell th-abstraction
-  ];
-  testHaskellDepends = [ base ghc-prim template-haskell ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/RyanGlScott/th-lift";
-  description = "Derive Template Haskell's Lift class for datatypes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-orphans.nix b/pkgs/th-orphans.nix
deleted file mode 100644
index ee4d28cd2247c95407db3e9850e79c6c51f929fc..0000000000000000000000000000000000000000
--- a/pkgs/th-orphans.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
-, lib, mtl, template-haskell, th-compat, th-lift, th-reify-many
-}:
-mkDerivation {
-  pname = "th-orphans";
-  version = "0.13.14";
-  sha256 = "9ddb2a1a0f6afeb8b6697256bfa5930f1f75e99624e370931c4b48bd16c3077c";
-  revision = "1";
-  editedCabalFile = "1lb3gi32gzy6ml8jxzyj6jp9gglgg2737aqc128gqz4g7wvbnasy";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base mtl template-haskell th-compat th-lift th-reify-many
-  ];
-  testHaskellDepends = [
-    base bytestring ghc-prim hspec template-haskell th-lift
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Orphan instances for TH datatypes";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-reify-many.nix b/pkgs/th-reify-many.nix
deleted file mode 100644
index cd7e7f1414aaa38eb22e071d6f0b4b9ec9cb9cc6..0000000000000000000000000000000000000000
--- a/pkgs/th-reify-many.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, containers, lib, mtl, safe, template-haskell
-, th-expand-syns
-}:
-mkDerivation {
-  pname = "th-reify-many";
-  version = "0.1.10";
-  sha256 = "9d250e61242f2fb887dedc9d28c0141832ff256e63bebc2bf5abff81037be4a5";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers mtl safe template-haskell th-expand-syns
-  ];
-  testHaskellDepends = [ base template-haskell ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/mgsloan/th-reify-many";
-  description = "Recurseively reify template haskell datatype info";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/th-utilities.nix b/pkgs/th-utilities.nix
deleted file mode 100644
index 47ba29b4d59d3b41d6ec9dab700e227ca902b66c..0000000000000000000000000000000000000000
--- a/pkgs/th-utilities.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, base, bytestring, containers, directory, filepath
-, hspec, lib, primitive, syb, template-haskell, text
-, th-abstraction, th-orphans, vector
-}:
-mkDerivation {
-  pname = "th-utilities";
-  version = "0.2.5.0";
-  sha256 = "4a0742a525e0ef22c993f1b6b693312bddcefe3afed9b6c519372d82931b97e1";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers directory filepath primitive syb
-    template-haskell text th-abstraction th-orphans
-  ];
-  testHaskellDepends = [
-    base bytestring containers directory filepath hspec primitive syb
-    template-haskell text th-abstraction th-orphans vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/th-utilities#readme";
-  description = "Collection of useful functions for use with Template Haskell";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/these.nix b/pkgs/these.nix
deleted file mode 100644
index ff2d76492e187246fb07e134986b4b7066b32cee..0000000000000000000000000000000000000000
--- a/pkgs/these.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, assoc, base, binary, deepseq
-, foldable1-classes-compat, hashable, lib
-}:
-mkDerivation {
-  pname = "these";
-  version = "1.2";
-  sha256 = "a8ed7174b7f790764360f48aab72fea382a6093ed369c7bc6881fae1abacd4b8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    assoc base binary deepseq foldable1-classes-compat hashable
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/these";
-  description = "An either-or-both data type";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/threads.nix b/pkgs/threads.nix
index e42dc6b5e8d67bca7e521fc7a7de94a8824ed04f..47d185b0da3577430dbf74cbcded0772660f5f48 100644
--- a/pkgs/threads.nix
+++ b/pkgs/threads.nix
@@ -1,16 +1,13 @@
-{ mkDerivation, Cabal, HUnit, base, concurrent-extra, lib, stm
+{ mkDerivation, HUnit, base, concurrent-extra, lib, stm
 , test-framework, test-framework-hunit
 }:
 mkDerivation {
   pname = "threads";
-  version = "0.5.1.7";
-  sha256 = "e0f6fea09b99a2f84c98089c27c011077bf43f1e1977a5c43997e226d23142d0";
-  revision = "1";
-  editedCabalFile = "18xxmb0x8lr6c90jc1vv078jm932aia9hm722l5wxmwly4a2n4wp";
+  version = "0.5.1.8";
+  sha256 = "c494d50a513ae65a8de773d84084c0acd5b6d3195571bdf97e77dc621fc24a9e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal ];
   libraryHaskellDepends = [ base stm ];
   testHaskellDepends = [
     base concurrent-extra HUnit stm test-framework test-framework-hunit
diff --git a/pkgs/tidal.nix b/pkgs/tidal.nix
index d04c6e98fd355a00e83464a7a4964ae1448e0bf8..294bf17eddb22d79ad82b36b6b256b0c0620b1a0 100644
--- a/pkgs/tidal.nix
+++ b/pkgs/tidal.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "tidal";
   version = "1.9.4";
   sha256 = "61dbc51935327c79d2714ab334a7abb1e81c1b3a0363d8de0018618a6901d788";
+  revision = "2";
+  editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
diff --git a/pkgs/time-compat.nix b/pkgs/time-compat.nix
deleted file mode 100644
index 9735193a02f09cfa3f53b079e7a61d19205c1a6a..0000000000000000000000000000000000000000
--- a/pkgs/time-compat.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, base-compat, base-orphans
-, deepseq, hashable, lib, tagged, tasty, tasty-hunit
-, tasty-quickcheck, time
-}:
-mkDerivation {
-  pname = "time-compat";
-  version = "1.9.6.1";
-  sha256 = "ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80";
-  revision = "5";
-  editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans deepseq hashable time
-  ];
-  testHaskellDepends = [
-    base base-compat deepseq hashable HUnit QuickCheck tagged tasty
-    tasty-hunit tasty-quickcheck time
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskellari/time-compat";
-  description = "Compatibility package for time";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/time-manager.nix b/pkgs/time-manager.nix
deleted file mode 100644
index 7db81e20664f63e9bd3771fc26e2a5c711f630fd..0000000000000000000000000000000000000000
--- a/pkgs/time-manager.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, auto-update, base, lib }:
-mkDerivation {
-  pname = "time-manager";
-  version = "0.0.0";
-  sha256 = "90a616ed20b2119bb64f78f84230b6798cde22a35e87bc8d9ee08cdf1d90fcdb";
-  revision = "1";
-  editedCabalFile = "1hwcns6rnh27nngq616cl9x2pl6lm4zzrsbbv5vq6hl0a60qhqjv";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ auto-update base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/yesodweb/wai";
-  description = "Scalable timer";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tls-session-manager.nix b/pkgs/tls-session-manager.nix
deleted file mode 100644
index 3eea5e2c4880dec122f83c98ff274f3e37e9030e..0000000000000000000000000000000000000000
--- a/pkgs/tls-session-manager.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, auto-update, base, basement, bytestring, clock, lib
-, memory, psqueues, tls
-}:
-mkDerivation {
-  pname = "tls-session-manager";
-  version = "0.0.4";
-  sha256 = "ba207f79b4536a65625063106c621e8bafc0dc7928bd9273270e19f36d59938c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    auto-update base basement bytestring clock memory psqueues tls
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "In-memory TLS session manager";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tls.nix b/pkgs/tls.nix
deleted file mode 100644
index abe691006a65e92a84bf054950de88aeb6c9db50..0000000000000000000000000000000000000000
--- a/pkgs/tls.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, QuickCheck, asn1-encoding, asn1-types, async, base
-, bytestring, cereal, cryptonite, data-default-class, gauge
-, hourglass, lib, memory, mtl, network, tasty, tasty-quickcheck
-, transformers, x509, x509-store, x509-validation
-}:
-mkDerivation {
-  pname = "tls";
-  version = "1.6.0";
-  sha256 = "d29d20afc1c1b852a3c39b076ec853cb596ac888cf521e54144441dec689e498";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    asn1-encoding asn1-types async base bytestring cereal cryptonite
-    data-default-class hourglass memory mtl network transformers x509
-    x509-store x509-validation
-  ];
-  testHaskellDepends = [
-    asn1-types async base bytestring cryptonite data-default-class
-    hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
-  ];
-  benchmarkHaskellDepends = [
-    asn1-types async base bytestring cryptonite data-default-class
-    gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-tls";
-  description = "TLS/SSL protocol native implementation (Server and Client)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/tmp-postgres.nix b/pkgs/tmp-postgres.nix
index f7a0199b48d6dc894f73eb1594af9593f86a2257..01992375e17dbb103e2f931f800d39182a8a81c9 100644
--- a/pkgs/tmp-postgres.nix
+++ b/pkgs/tmp-postgres.nix
@@ -1,21 +1,26 @@
-{ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring
-, bytestring, containers, criterion, cryptohash-sha1, deepseq
-, directory, generic-monoid, hspec, lib, mtl, network, port-utils
-, postgres-options, postgresql-simple, process, stm, temporary
-, transformers, unix
+{ mkDerivation, async, base, base64-bytestring, bytestring
+, containers, criterion, cryptohash-sha1, deepseq, directory
+, fetchgit, generic-monoid, hspec, lib, mtl, network, port-utils
+, postgres-options, postgresql-simple, prettyprinter, process, stm
+, temporary, transformers, unix
 }:
 mkDerivation {
   pname = "tmp-postgres";
-  version = "1.34.1.0";
-  sha256 = "98514428edaf527cc464cb9a30df89c6168c858e039ab1baf8293471196c3ba2";
+  version = "1.35.0.0";
+  src = fetchgit {
+    url = "https://github.com/jfischoff/tmp-postgres";
+    sha256 = "0l1gdx5s8ximgawd3yzfy47pv5pgwqmjqp8hx5rbrq68vr04wkbl";
+    rev = "7f2467a6d6d5f6db7eed59919a6773fe006cf22b";
+    fetchSubmodules = true;
+  };
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint async base base64-bytestring bytestring containers
-    cryptohash-sha1 deepseq directory generic-monoid port-utils
-    postgres-options postgresql-simple process stm temporary
-    transformers unix
+    async base base64-bytestring bytestring containers cryptohash-sha1
+    deepseq directory generic-monoid port-utils postgres-options
+    postgresql-simple prettyprinter process stm temporary transformers
+    unix
   ];
   executableHaskellDepends = [
     async base directory postgres-options postgresql-simple process
diff --git a/pkgs/toml-parser.nix b/pkgs/toml-parser.nix
new file mode 100644
index 0000000000000000000000000000000000000000..80706d5910f2c3b37960dde6dc00a1d1edc159c7
--- /dev/null
+++ b/pkgs/toml-parser.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, alex, array, base, containers, happy, hspec
+, hspec-discover, lib, markdown-unlit, prettyprinter
+, template-haskell, text, time, transformers
+}:
+mkDerivation {
+  pname = "toml-parser";
+  version = "1.3.0.0";
+  sha256 = "fcd6a27a4ede2367b4b2d3ffa0cce722cb78adc6647774dbeef8d248bf825b98";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    array base containers prettyprinter text time transformers
+  ];
+  libraryToolDepends = [ alex happy ];
+  testHaskellDepends = [
+    base containers hspec template-haskell time
+  ];
+  testToolDepends = [ hspec-discover markdown-unlit ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  description = "TOML 1.0.0 parser";
+  license = lib.licenses.isc;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/transformers-base.nix b/pkgs/transformers-base.nix
deleted file mode 100644
index cc7ec437ba99900f31f15c627334a0be1fa860f2..0000000000000000000000000000000000000000
--- a/pkgs/transformers-base.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, base-orphans, lib, stm, transformers
-, transformers-compat
-}:
-mkDerivation {
-  pname = "transformers-base";
-  version = "0.4.6";
-  sha256 = "323bf8689eb691b122661cffa41a25e00fea7a768433fe2dde35d3da7d32cf90";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans stm transformers transformers-compat
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/mvv/transformers-base";
-  description = "Lift computations from the bottom of a transformer stack";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/transformers-compat.nix b/pkgs/transformers-compat.nix
deleted file mode 100644
index c18a85340c4579e4164f9614e82ba4107796ba59..0000000000000000000000000000000000000000
--- a/pkgs/transformers-compat.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib, transformers }:
-mkDerivation {
-  pname = "transformers-compat";
-  version = "0.7.2";
-  sha256 = "b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/transformers-compat/";
-  description = "A small compatibility shim for the transformers library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/transformers-except.nix b/pkgs/transformers-except.nix
index 2ce848f65aea1a76644d084caf20cd63b331c1ea..3cb7aa712a696cd69d35c5a4f6cfdbefe1e18490 100644
--- a/pkgs/transformers-except.nix
+++ b/pkgs/transformers-except.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, exceptions, lib, text, transformers }:
 mkDerivation {
   pname = "transformers-except";
-  version = "0.1.3";
-  sha256 = "484babf024bd82e87cc8305bd38ae04d40a7c24fa81c487cc603c3c9fd230c0d";
+  version = "0.1.4";
+  sha256 = "71990961552b1eaa66f54e65f0b709c9a96d2121c3959a13ddcb5b5a5d67e40d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/tree-diff.nix b/pkgs/tree-diff.nix
deleted file mode 100644
index 0d5f152b037ebfa908f33cd528dace124405ed4a..0000000000000000000000000000000000000000
--- a/pkgs/tree-diff.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, Diff, QuickCheck, aeson, ansi-terminal
-, ansi-wl-pprint, base, base-compat, bytestring, bytestring-builder
-, containers, criterion, deepseq, hashable, lib, parsec, parsers
-, pretty, primitive, scientific, semialign, strict, tagged, tasty
-, tasty-golden, tasty-quickcheck, text, these, time, trifecta
-, unordered-containers, uuid-types, vector
-}:
-mkDerivation {
-  pname = "tree-diff";
-  version = "0.3.0.1";
-  sha256 = "40e67c9f7f21850f17ecc96ef983d833284626bbe3f43f2e8a0877ace9d472ae";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
-    bytestring-builder containers deepseq hashable parsec parsers
-    pretty primitive QuickCheck scientific semialign strict tagged text
-    these time unordered-containers uuid-types vector
-  ];
-  testHaskellDepends = [
-    ansi-terminal ansi-wl-pprint base base-compat parsec primitive
-    QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta
-    unordered-containers
-  ];
-  benchmarkHaskellDepends = [ base criterion deepseq Diff ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/tree-diff";
-  description = "Diffing of (expression) trees";
-  license = lib.licenses.gpl2Plus;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/trifecta.nix b/pkgs/trifecta.nix
deleted file mode 100644
index a3927247f2eb80dde26ebf2c1c8cd5bc3d59e335..0000000000000000000000000000000000000000
--- a/pkgs/trifecta.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, QuickCheck, ansi-terminal, array, base
-, blaze-builder, blaze-html, blaze-markup, bytestring, charset
-, comonad, containers, deepseq, fingertree, ghc-prim, hashable
-, indexed-traversable, lens, lib, mtl, parsers, prettyprinter
-, prettyprinter-ansi-terminal, profunctors, reducers, transformers
-, unordered-containers, utf8-string
-}:
-mkDerivation {
-  pname = "trifecta";
-  version = "2.1.2";
-  sha256 = "8a3a4e3367f6b62152dd4f75c52f9972082c31ed0c24a7e1d27cea574d457daa";
-  revision = "1";
-  editedCabalFile = "0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal array base blaze-builder blaze-html blaze-markup
-    bytestring charset comonad containers deepseq fingertree ghc-prim
-    hashable indexed-traversable lens mtl parsers prettyprinter
-    prettyprinter-ansi-terminal profunctors reducers transformers
-    unordered-containers utf8-string
-  ];
-  testHaskellDepends = [ base parsers QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/trifecta/";
-  description = "A modern parser combinator library with convenient diagnostics";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/turtle.nix b/pkgs/turtle.nix
deleted file mode 100644
index f1b90cd2cdac7508ab1255eeb8fda577463f33f1..0000000000000000000000000000000000000000
--- a/pkgs/turtle.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-, containers, directory, doctest, exceptions, filepath, foldl
-, hostname, lib, managed, optional-args, optparse-applicative
-, process, stm, streaming-commons, tasty, tasty-bench, tasty-hunit
-, temporary, text, time, transformers, unix, unix-compat
-}:
-mkDerivation {
-  pname = "turtle";
-  version = "1.6.1";
-  sha256 = "2795445c93a4b646dd02b68ebf4006f8ec3588c85ccfe9d47810597e638e3b9c";
-  revision = "3";
-  editedCabalFile = "00jxvvpffllwcaw2sg0rymj66963ihifpjn4m94mgscqwl25cfqs";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-wl-pprint async base bytestring clock containers directory
-    exceptions filepath foldl hostname managed optional-args
-    optparse-applicative process stm streaming-commons temporary text
-    time transformers unix unix-compat
-  ];
-  testHaskellDepends = [
-    base doctest filepath tasty tasty-hunit temporary
-  ];
-  benchmarkHaskellDepends = [ base tasty-bench text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Shell programming, Haskell-style";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/type-equality.nix b/pkgs/type-equality.nix
deleted file mode 100644
index df6fc79478c8a709b1d39f83c9aee2ea492fc6b2..0000000000000000000000000000000000000000
--- a/pkgs/type-equality.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "type-equality";
-  version = "1";
-  sha256 = "4728b502a211454ef682a10d7a3e817c22d06ba509df114bb267ef9d43a08ce8";
-  revision = "5";
-  editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hesselink/type-equality";
-  description = "Data.Type.Equality compat package";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/typed-process.nix b/pkgs/typed-process.nix
deleted file mode 100644
index 7102232a380dec7914b9f7f1e2afe1c1f4702b25..0000000000000000000000000000000000000000
--- a/pkgs/typed-process.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, async, base, base64-bytestring, bytestring, hspec
-, lib, process, stm, temporary, transformers, unliftio-core
-}:
-mkDerivation {
-  pname = "typed-process";
-  version = "0.2.11.0";
-  sha256 = "948c59540675d85f35c99e285cdb8686713ec1689f530d5d21813239ea91f625";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base bytestring process stm transformers unliftio-core
-  ];
-  testHaskellDepends = [
-    async base base64-bytestring bytestring hspec process stm temporary
-    transformers unliftio-core
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/typed-process";
-  description = "Run external processes, with strong typing of streams";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/microlens.nix b/pkgs/typst-symbols.nix
similarity index 53%
rename from pkgs/microlens.nix
rename to pkgs/typst-symbols.nix
index a535446b4440df30a6a21346c63705c880a90cf9..37aa597bf881f901e03dec90aacb480624524b74 100644
--- a/pkgs/microlens.nix
+++ b/pkgs/typst-symbols.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, base, lib }:
+{ mkDerivation, base, lib, text }:
 mkDerivation {
-  pname = "microlens";
-  version = "0.4.13.1";
-  sha256 = "0a54abee8ff4f6aeb4bea0783409a3dbd28a4e7a892bac916b0fb6a71382d7fc";
+  pname = "typst-symbols";
+  version = "0.1.4";
+  sha256 = "cbb4189d9430c9dabe1f5fb0398ec3fd1ebd035b8c66feea0972c2c3ad23eb4e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
+  libraryHaskellDepends = [ base text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -14,8 +14,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/monadfix/microlens";
-  description = "A tiny lens library with no dependencies";
-  license = lib.licenses.bsd3;
+  homepage = "https://github.com/jgm/typst-symbols";
+  description = "Symbol and emoji lookup for typst language";
+  license = lib.licenses.mit;
   broken = false;
 }
\ No newline at end of file
diff --git a/pkgs/typst.nix b/pkgs/typst.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3a8d7264f29865dc54f98e5680fee8a634730db7
--- /dev/null
+++ b/pkgs/typst.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, aeson, array, base, bytestring, cassava, containers
+, digits, directory, filepath, lib, mtl, ordered-containers, parsec
+, pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden
+, text, time, toml-parser, typst-symbols, vector, xml-conduit, yaml
+}:
+mkDerivation {
+  pname = "typst";
+  version = "0.3.2.1";
+  sha256 = "756a901db74317797d2b064fe72142c60ea5242d76991d68b8b21805c38bc145";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    aeson array base bytestring cassava containers digits directory
+    filepath mtl ordered-containers parsec pretty regex-tdfa scientific
+    text time toml-parser typst-symbols vector xml-conduit yaml
+  ];
+  testHaskellDepends = [
+    base bytestring directory filepath pretty-show tasty tasty-golden
+    text time
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  description = "Parsing and evaluating typst syntax";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/unbounded-delays.nix b/pkgs/unbounded-delays.nix
deleted file mode 100644
index 7d125975aac0971ec8a0ecc14e40e1ccbe889671..0000000000000000000000000000000000000000
--- a/pkgs/unbounded-delays.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "unbounded-delays";
-  version = "0.1.1.1";
-  sha256 = "59ad7e53bfe32ffbf0e703b31490d41d14c70e4745ed49e8adf592ed68dd6185";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/basvandijk/unbounded-delays";
-  description = "Unbounded thread delays and timeouts";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/unicode-collation.nix b/pkgs/unicode-collation.nix
index 880ce063e3e5d48fc1ca2e77458526d7ae3ad179..e22973df2014712a60713851b1f930b344b7a3c6 100644
--- a/pkgs/unicode-collation.nix
+++ b/pkgs/unicode-collation.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "unicode-collation";
-  version = "0.1.3.4";
-  sha256 = "b08dbe9bb269d6eda2639cdfc63caee136794f46c16a1ad51b5305dd2ea6d429";
+  version = "0.1.3.5";
+  sha256 = "0229e00ad5f442f6f6c662f3fa02094a6c2cfc3484675712ff374274f4504379";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/unicode-transforms.nix b/pkgs/unicode-transforms.nix
index fcbbb0d8fdb3078c66e6ff6ed9e776d898653224..61fee90c2863c7e8d5e966cb204d2642ea0fec2a 100644
--- a/pkgs/unicode-transforms.nix
+++ b/pkgs/unicode-transforms.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "unicode-transforms";
   version = "0.4.0.1";
   sha256 = "3278e1e1d648da4bcd7368658ae091a89080e88a2f44db9df5136711e99649fc";
-  revision = "3";
-  editedCabalFile = "1hx6v04g4g1d8y8nm26k7vkhgfqmcch5xhvljlz67grw0j5d1zxd";
+  revision = "4";
+  editedCabalFile = "16d6l9ybs2wdwxdf3xfs25pzkkf3svflsn6ncvg86yky4x50zg29";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/uniplate.nix b/pkgs/uniplate.nix
deleted file mode 100644
index 80c0b4f48a30b1407fae8952615077160e4c6bb7..0000000000000000000000000000000000000000
--- a/pkgs/uniplate.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, containers, ghc-prim, hashable, lib, syb
-, unordered-containers
-}:
-mkDerivation {
-  pname = "uniplate";
-  version = "1.6.13";
-  sha256 = "e777c94628445556a71f135a42cf72d2cfbaccba5849cc42fbfec8b2182e3ad2";
-  revision = "1";
-  editedCabalFile = "1rvvzmi43gbrww0f17dzchm3g61zvm97arrfa5raljqb1mbibdy8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers ghc-prim hashable syb unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/ndmitchell/uniplate#readme";
-  description = "Help writing simple, concise and fast generic operations";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/universe-base.nix b/pkgs/universe-base.nix
deleted file mode 100644
index b07085d7f24f125f61e66a220498ac98b7749f69..0000000000000000000000000000000000000000
--- a/pkgs/universe-base.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, lib, tagged
-, transformers
-}:
-mkDerivation {
-  pname = "universe-base";
-  version = "1.1.3.1";
-  sha256 = "a3e7ef305d79c58caa25276929f0cd2c129468484502b93b7f9b3b7b77e5732d";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers tagged transformers ];
-  testHaskellDepends = [ base containers QuickCheck ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/dmwit/universe";
-  description = "A class for finite and recursively enumerable types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/universe-reverse-instances.nix b/pkgs/universe-reverse-instances.nix
index 20e55b6805267d52131b09a4d2ca4667162ded15..513f27608ac1a11d8e8c4a5a3b7a171d2f65bfa3 100644
--- a/pkgs/universe-reverse-instances.nix
+++ b/pkgs/universe-reverse-instances.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "universe-reverse-instances";
   version = "1.1.1";
   sha256 = "c4127e12a6af8d8e05f87e546a57fdc0bd7b7f47eaf85d4a0f1826c998cdfb73";
-  revision = "3";
-  editedCabalFile = "1skyr1b7jvlbphlnf373qx78qd41cz643cn7ssyncwbv30ndbs23";
+  revision = "4";
+  editedCabalFile = "0s6779rs0p0wrarn749rasifiij8x8mihbg8m6cgazs1cxpfykjd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/unix-compat.nix b/pkgs/unix-compat.nix
deleted file mode 100644
index 90609809174b0d286bbf36424aad3f46e0d4ad5e..0000000000000000000000000000000000000000
--- a/pkgs/unix-compat.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, HUnit, base, directory, extra, hspec, lib
-, monad-parallel, temporary, unix
-}:
-mkDerivation {
-  pname = "unix-compat";
-  version = "0.7";
-  sha256 = "2b75ca79e0f7368f915f01ca6a5201f7df58ada46b9e4869bca1b92d853f2e3e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base unix ];
-  testHaskellDepends = [
-    base directory extra hspec HUnit monad-parallel temporary
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/haskell-pkg-janitors/unix-compat";
-  description = "Portable POSIX-compatibility layer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/unix-time.nix b/pkgs/unix-time.nix
deleted file mode 100644
index 17057ee53ecffde7663da7d4188d43b0e1136a44..0000000000000000000000000000000000000000
--- a/pkgs/unix-time.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring, hspec
-, hspec-discover, lib, old-locale, old-time, time
-}:
-mkDerivation {
-  pname = "unix-time";
-  version = "0.4.9";
-  sha256 = "490734d4860e065aa92fb3f54dc07ba5fa61b4a0c6fb9989f38d5713bcac8b08";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base binary bytestring old-time ];
-  testHaskellDepends = [
-    base bytestring hspec old-locale old-time QuickCheck time
-  ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Unix time parser/formatter and utilities";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/unliftio-core.nix b/pkgs/unliftio-core.nix
deleted file mode 100644
index a50863f4b38b27c153fa45fc40231348b9548f6f..0000000000000000000000000000000000000000
--- a/pkgs/unliftio-core.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, lib, transformers }:
-mkDerivation {
-  pname = "unliftio-core";
-  version = "0.2.1.0";
-  sha256 = "99384cba8d56d9d61b85e38a313a93ebcdb78be6566367f0930ef580597fe3e3";
-  revision = "1";
-  editedCabalFile = "19pw6f7hmka8kgnsbrrhp73rdnvdsmagh1s325rxqv5if1km1hwz";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base transformers ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme";
-  description = "The MonadUnliftIO typeclass for unlifting monads to IO";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/unliftio.nix b/pkgs/unliftio.nix
deleted file mode 100644
index 2b0b5e195968f336aa11607c5f55170090b929ec..0000000000000000000000000000000000000000
--- a/pkgs/unliftio.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, QuickCheck, async, base, bytestring, containers
-, deepseq, directory, filepath, gauge, hspec, lib, process
-, safe-exceptions, stm, time, transformers, unix, unliftio-core
-}:
-mkDerivation {
-  pname = "unliftio";
-  version = "0.2.24.0";
-  sha256 = "fd8ab9b84cec794570faa53e88cf83af2bf7f5566baebf6b664892178d50229b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    async base bytestring deepseq directory filepath process
-    safe-exceptions stm time transformers unix unliftio-core
-  ];
-  testHaskellDepends = [
-    async base bytestring containers deepseq directory filepath hspec
-    process QuickCheck safe-exceptions stm time transformers unix
-    unliftio-core
-  ];
-  benchmarkHaskellDepends = [
-    async base bytestring deepseq directory filepath gauge process
-    safe-exceptions stm time transformers unix unliftio-core
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-  description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/unordered-containers.nix b/pkgs/unordered-containers.nix
deleted file mode 100644
index a74eefcc6a9704cb9a82ba50f9a4f246faa77e2e..0000000000000000000000000000000000000000
--- a/pkgs/unordered-containers.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, ChasingBottoms, HUnit, QuickCheck, base, bytestring
-, containers, deepseq, hashable, hashmap, lib, mtl, nothunks
-, random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck
-, template-haskell
-}:
-mkDerivation {
-  pname = "unordered-containers";
-  version = "0.2.19.1";
-  sha256 = "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2";
-  revision = "2";
-  editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq hashable template-haskell ];
-  testHaskellDepends = [
-    base ChasingBottoms containers hashable HUnit nothunks QuickCheck
-    random tasty tasty-hunit tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring containers deepseq hashable hashmap mtl random
-    tasty-bench
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-unordered-containers/unordered-containers";
-  description = "Efficient hashing-based container types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/uri-encode.nix b/pkgs/uri-encode.nix
deleted file mode 100644
index 0387aa373d303eb4ab859b6a626577e4e8aa1a39..0000000000000000000000000000000000000000
--- a/pkgs/uri-encode.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, lib, network-uri, text
-, utf8-string
-}:
-mkDerivation {
-  pname = "uri-encode";
-  version = "1.5.0.7";
-  sha256 = "c79c624257833841a22890e4d2b0ab07e4be88e0f99474d328223815c0814252";
-  revision = "2";
-  editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring network-uri text utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Unicode aware uri-encoding";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/utf8-string.nix b/pkgs/utf8-string.nix
deleted file mode 100644
index 7f9b64f116410bf6d6d10978b1d094dc11c1317b..0000000000000000000000000000000000000000
--- a/pkgs/utf8-string.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, HUnit, base, bytestring, lib }:
-mkDerivation {
-  pname = "utf8-string";
-  version = "1.0.2";
-  sha256 = "ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  testHaskellDepends = [ base HUnit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/glguy/utf8-string/";
-  description = "Support for reading and writing UTF8 Strings";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/utility-ht.nix b/pkgs/utility-ht.nix
deleted file mode 100644
index 81467e26becbc05b5410c8f56ce3099ed56050a0..0000000000000000000000000000000000000000
--- a/pkgs/utility-ht.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, QuickCheck, base, doctest-exitcode-stdio
-, doctest-lib, lib
-}:
-mkDerivation {
-  pname = "utility-ht";
-  version = "0.0.17";
-  sha256 = "62418aee068bd0f9bd2caa135e2307fd246b7dd53015c9dcbe7a17dcb6f19a98";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [
-    base doctest-exitcode-stdio doctest-lib QuickCheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/uuid-types.nix b/pkgs/uuid-types.nix
deleted file mode 100644
index df2c6eb196c255176e94af4bbb8a1a21c0e57902..0000000000000000000000000000000000000000
--- a/pkgs/uuid-types.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq
-, ghc-byteorder, hashable, lib, random, tasty, tasty-hunit
-, tasty-quickcheck, template-haskell, text
-}:
-mkDerivation {
-  pname = "uuid-types";
-  version = "1.0.5";
-  sha256 = "ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd";
-  revision = "4";
-  editedCabalFile = "08anv4hc75n1npjl4b8hrww97imgh6bsm1mfqn33n29ga84jcrp4";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base binary bytestring deepseq hashable random template-haskell
-    text
-  ];
-  testHaskellDepends = [
-    base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit
-    tasty-quickcheck template-haskell
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell-hvr/uuid";
-  description = "Type definitions for Universally Unique Identifiers";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/uuid.nix b/pkgs/uuid.nix
index 65ebac5c6baeefbd58db96d90b97acf06d578969..da38074af20574ca667410cf128ae7e2b182c849 100644
--- a/pkgs/uuid.nix
+++ b/pkgs/uuid.nix
@@ -7,8 +7,8 @@ mkDerivation {
   pname = "uuid";
   version = "1.3.15";
   sha256 = "f885958d8934930b7c0f9b91f980722f7f992c9383fc98f075cf9df64c800564";
-  revision = "2";
-  editedCabalFile = "06j1hk4alypnwd4v55w6lfm1jrsaqh85k350qmymw0sqbrd9rmx3";
+  revision = "3";
+  editedCabalFile = "089q2i4rmw8iqzjn2fif4yarnbb7gsnsa4c4zhl24l2hlyakymbx";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/validation-selective.nix b/pkgs/validation-selective.nix
index 77f809bc4b75579fdcbd4776b9bdf7559853802e..a183ab4033521a3ca3186deca8bc283dbe52e84b 100644
--- a/pkgs/validation-selective.nix
+++ b/pkgs/validation-selective.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "validation-selective";
   version = "0.2.0.0";
   sha256 = "9a884e97e6a64f2cacadec8d5ea7e8ba7562d0c8fa9ab7cd5c34055eaec64987";
+  revision = "2";
+  editedCabalFile = "1lzx925znym2jx0qwicx7cv9ixy5qw4r3819sxvgd2yyvs159az1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/validation.nix b/pkgs/validation.nix
index 7f628fbdcba3cc861bb92ed8b1aa21c44a84e4b6..fe2efe056ecfbbf601370e3da98f841bae786abd 100644
--- a/pkgs/validation.nix
+++ b/pkgs/validation.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "validation";
-  version = "1.1.2";
-  sha256 = "1dcd52a577d06fbeb66a5acdeb125a438fc9aa4f07ef854cd93f4123a7f81096";
+  version = "1.1.3";
+  sha256 = "7b41e914cdca32a4e17667e3eea76219fadbf36b46e748bc5a4ab1a23fdd3795";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/validity-aeson.nix b/pkgs/validity-aeson.nix
deleted file mode 100644
index b95028c4e02f5d83c62c78480a6bff61e4c91b84..0000000000000000000000000000000000000000
--- a/pkgs/validity-aeson.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, base, hspec, lib, validity
-, validity-scientific, validity-text, validity-unordered-containers
-, validity-vector
-}:
-mkDerivation {
-  pname = "validity-aeson";
-  version = "0.2.0.5";
-  sha256 = "b232c3bb0a3a1ae342f41c42eb90e8931421e409ed4930c2b89246a521ae623e";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base validity validity-scientific validity-text
-    validity-unordered-containers validity-vector
-  ];
-  testHaskellDepends = [ aeson base hspec validity ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for aeson";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-bytestring.nix b/pkgs/validity-bytestring.nix
deleted file mode 100644
index dc5be16dd3f34d063aba67903d837d1ad79b011d..0000000000000000000000000000000000000000
--- a/pkgs/validity-bytestring.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, bytestring, lib, validity }:
-mkDerivation {
-  pname = "validity-bytestring";
-  version = "0.4.1.1";
-  sha256 = "7db8912c29ceff3fd8943a61845f9c0738d7238ca49bce2e6f3c6bc490bd6732";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring validity ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for bytestring";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-containers.nix b/pkgs/validity-containers.nix
deleted file mode 100644
index 85e1d0d5ff84ef0ecbced8683ec36bac9e39b2c5..0000000000000000000000000000000000000000
--- a/pkgs/validity-containers.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, containers, lib, validity }:
-mkDerivation {
-  pname = "validity-containers";
-  version = "0.5.0.4";
-  sha256 = "8de2ac38381ecc4fd7f3bfe48b2a398de8b9e018ddf84420178d94dc80b985e3";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers validity ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for containers";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-scientific.nix b/pkgs/validity-scientific.nix
deleted file mode 100644
index 28988ac7dbb1dac51806691fd0c8e81226325d1f..0000000000000000000000000000000000000000
--- a/pkgs/validity-scientific.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, scientific, validity }:
-mkDerivation {
-  pname = "validity-scientific";
-  version = "0.2.0.3";
-  sha256 = "773a4a35933637d0bade859dd0e8acadc781d9ccd3b057d60e7ffaaa20e5186f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base scientific validity ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for scientific";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-text.nix b/pkgs/validity-text.nix
deleted file mode 100644
index 13874d127c431f48b389418e7e25740453a42811..0000000000000000000000000000000000000000
--- a/pkgs/validity-text.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, bytestring, lib, text, validity }:
-mkDerivation {
-  pname = "validity-text";
-  version = "0.3.1.3";
-  sha256 = "7aee83b507181886d824a0c45b835888494874d7d22f1aa5859062354a93fd45";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring text validity ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for text";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-unordered-containers.nix b/pkgs/validity-unordered-containers.nix
deleted file mode 100644
index 7f6abbfc6d8f3a52826553189935df13da7e32d3..0000000000000000000000000000000000000000
--- a/pkgs/validity-unordered-containers.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, base, hashable, lib, unordered-containers, validity
-}:
-mkDerivation {
-  pname = "validity-unordered-containers";
-  version = "0.2.0.3";
-  sha256 = "f20d6b20b9695379f3478b357cd7c0968c3726ef4336eb0c652b84a34e332a87";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base hashable unordered-containers validity
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for unordered-containers";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity-vector.nix b/pkgs/validity-vector.nix
deleted file mode 100644
index d120ce1a2623eb8a8be560918535abab9ba002ba..0000000000000000000000000000000000000000
--- a/pkgs/validity-vector.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, hashable, lib, validity, vector }:
-mkDerivation {
-  pname = "validity-vector";
-  version = "0.2.0.3";
-  sha256 = "3e6c66c10220da63a9d02f77df6394a1428332295961ac948b648199e0686e49";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hashable validity vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity instances for vector";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/validity.nix b/pkgs/validity.nix
deleted file mode 100644
index b10a63442d0e4e65df69163b9e03daeb9bd433c7..0000000000000000000000000000000000000000
--- a/pkgs/validity.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, hspec, lib }:
-mkDerivation {
-  pname = "validity";
-  version = "0.12.0.1";
-  sha256 = "1c3ce2052b73a47bd6ea6cb757e0dac5cf1cacf3558cb06b5ab725ad30d73ec9";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base hspec ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/NorfairKing/validity#readme";
-  description = "Validity typeclass";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vault.nix b/pkgs/vault.nix
deleted file mode 100644
index 289248662083bd410f36be31b60c08b554c32df4..0000000000000000000000000000000000000000
--- a/pkgs/vault.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, containers, hashable, lib
-, unordered-containers
-}:
-mkDerivation {
-  pname = "vault";
-  version = "0.3.1.5";
-  sha256 = "ac2a6b6adf58598c5c8faa931ae961a8a2aa50ddb2f0f7a2044ff6e8c3d433a0";
-  revision = "3";
-  editedCabalFile = "0avlxhj4m8sb1b9rh203jsaapw6q55bpgy4jnhjyq6an8dhnsg9i";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base containers hashable unordered-containers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/HeinrichApfelmus/vault";
-  description = "a persistent store for values of arbitrary types";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vec.nix b/pkgs/vec.nix
deleted file mode 100644
index bfc245ad59d1c7edf909bf2b3cdc683d064eee2b..0000000000000000000000000000000000000000
--- a/pkgs/vec.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, QuickCheck, adjunctions, base, base-compat, boring
-, criterion, deepseq, distributive, fin, hashable
-, indexed-traversable, inspection-testing, lib, semigroupoids
-, tagged, transformers, vector
-}:
-mkDerivation {
-  pname = "vec";
-  version = "0.5";
-  sha256 = "0a2403f857ba10ff6f159b4ded0930d0d3cf046bef29de1d5929f9e51356209f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    adjunctions base boring deepseq distributive fin hashable
-    indexed-traversable QuickCheck semigroupoids transformers
-  ];
-  testHaskellDepends = [
-    base base-compat fin inspection-testing tagged
-  ];
-  benchmarkHaskellDepends = [ base criterion fin vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/vec";
-  description = "Vec: length-indexed (sized) list";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vector-algorithms.nix b/pkgs/vector-algorithms.nix
deleted file mode 100644
index a660f5c526f1fe1d698f32dac6934a523e9edbc2..0000000000000000000000000000000000000000
--- a/pkgs/vector-algorithms.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, QuickCheck, base, bitvec, bytestring, containers
-, lib, mwc-random, primitive, vector
-}:
-mkDerivation {
-  pname = "vector-algorithms";
-  version = "0.9.0.1";
-  sha256 = "2ba7c0d3a8f26ef3ada24ff4abe81609225ecbab3b5754f048f8a0a3ecc33841";
-  revision = "2";
-  editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bitvec bytestring primitive vector
-  ];
-  testHaskellDepends = [
-    base bytestring containers QuickCheck vector
-  ];
-  benchmarkHaskellDepends = [ base mwc-random vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/erikd/vector-algorithms/";
-  description = "Efficient algorithms for vector arrays";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vector-binary-instances.nix b/pkgs/vector-binary-instances.nix
deleted file mode 100644
index 71141c29809774c387ae22a9e90f7833562d0532..0000000000000000000000000000000000000000
--- a/pkgs/vector-binary-instances.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, base, binary, bytestring, deepseq, lib, tasty
-, tasty-bench, tasty-quickcheck, vector
-}:
-mkDerivation {
-  pname = "vector-binary-instances";
-  version = "0.2.5.2";
-  sha256 = "b72e3b2109a02c75cb8f07ef0aabba0dba6ec0148e21321a0a2b2197c9a2f54d";
-  revision = "3";
-  editedCabalFile = "0av0k2gn90mf5ai74575bd368x73ljnr7xlkwsqmrs6zdzkw0i83";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base binary vector ];
-  testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
-  benchmarkHaskellDepends = [
-    base binary bytestring deepseq tasty-bench vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/bos/vector-binary-instances";
-  description = "Instances of Data.Binary for vector";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vector-sized.nix b/pkgs/vector-sized.nix
index d6d52f59c6f5722b3f291f6c0acf00e4decc3dc5..1a4c4e4110142e03f976ae2e2d77d7bfb1b4acde 100644
--- a/pkgs/vector-sized.nix
+++ b/pkgs/vector-sized.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "vector-sized";
   version = "1.5.0";
   sha256 = "54deae5e1d504821d63d5eedfcaea0d01b26af3b8123971ad7f1241326c3048e";
-  revision = "1";
-  editedCabalFile = "0y088b8fdhjrghi203n11ip4x2j4632c8rz6a5hx8azmdz2giiph";
+  revision = "3";
+  editedCabalFile = "1rj53ya87vnglqdnzfvb4w01k3g3wqkcc1i7ip2xryz6pw6vg18w";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/vector-stream.nix b/pkgs/vector-stream.nix
deleted file mode 100644
index c012354967fab998df857a8d611c6a4291e05330..0000000000000000000000000000000000000000
--- a/pkgs/vector-stream.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, ghc-prim, lib }:
-mkDerivation {
-  pname = "vector-stream";
-  version = "0.1.0.0";
-  sha256 = "a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c";
-  revision = "2";
-  editedCabalFile = "1jldm2bh9d0y7vmyv3l85ilps4n8ypqr6da0cgqg5dfi3hlxbmpm";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ghc-prim ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/vector";
-  description = "Efficient Streams";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vector-th-unbox.nix b/pkgs/vector-th-unbox.nix
deleted file mode 100644
index 20b1c14820ce7a4cddc2e61976bfe7cb187dd4bb..0000000000000000000000000000000000000000
--- a/pkgs/vector-th-unbox.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, data-default, lib, template-haskell, vector
-}:
-mkDerivation {
-  pname = "vector-th-unbox";
-  version = "0.2.2";
-  sha256 = "8aa4ca464e842706e5b5234b8242d1aafec9ee755659b0e3ff44ecde13a80149";
-  revision = "4";
-  editedCabalFile = "08pvbwy6cb2hb15wczqp9056rxj86f2kc972py4sj5adkmf9mzrj";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base template-haskell vector ];
-  testHaskellDepends = [ base data-default vector ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/tsurucapital/vector-th-unbox";
-  description = "Deriver for Data.Vector.Unboxed using Template Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vector.nix b/pkgs/vector.nix
deleted file mode 100644
index 070ae6b60135792d2ae0dd5d36589dca4a12d6a4..0000000000000000000000000000000000000000
--- a/pkgs/vector.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, base-orphans, deepseq
-, doctest, lib, primitive, random, tasty, tasty-bench, tasty-hunit
-, tasty-inspection-testing, tasty-quickcheck, template-haskell
-, transformers, vector-stream
-}:
-mkDerivation {
-  pname = "vector";
-  version = "0.13.0.0";
-  sha256 = "c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f";
-  revision = "3";
-  editedCabalFile = "0k14l1r84gxjv385crq8f1kvdcr4kjwyi4k7f64g6nksl60sqp7s";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq primitive vector-stream ];
-  testHaskellDepends = [
-    base base-orphans doctest HUnit primitive QuickCheck random tasty
-    tasty-hunit tasty-inspection-testing tasty-quickcheck
-    template-haskell transformers
-  ];
-  benchmarkHaskellDepends = [ base random tasty tasty-bench ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/vector";
-  description = "Efficient Arrays";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/void.nix b/pkgs/void.nix
deleted file mode 100644
index f7d00f7c4067a73fe401a302ba7d588d74e21ccc..0000000000000000000000000000000000000000
--- a/pkgs/void.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
-  pname = "void";
-  version = "0.7.3";
-  sha256 = "53af758ddc37dc63981671e503438d02c6f64a2d8744e9bec557a894431f7317";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/ekmett/void";
-  description = "A Haskell 98 logically uninhabited data type";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/vty-crossplatform.nix b/pkgs/vty-crossplatform.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f9281edb51b37fb6d237ade5044c63c073096bcb
--- /dev/null
+++ b/pkgs/vty-crossplatform.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, base, lib, vty, vty-unix }:
+mkDerivation {
+  pname = "vty-crossplatform";
+  version = "0.1.0.0";
+  sha256 = "3c0533fdf9ad65164bb7018dd5e6c9fe1f47be8396bd445bb75a6c6808f999f7";
+  revision = "1";
+  editedCabalFile = "0z5y357j0kjpvs3kpy7qm4ajcvfvng9jyfpgx104mr1ffgdk2xg0";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base vty vty-unix ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  description = "Cross-platform support for Vty";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/vty-unix.nix b/pkgs/vty-unix.nix
new file mode 100644
index 0000000000000000000000000000000000000000..53b8d5c66357748d484a487ab19a76a641589bb4
--- /dev/null
+++ b/pkgs/vty-unix.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, ansi-terminal, base, blaze-builder, bytestring
+, containers, deepseq, lib, microlens, microlens-mtl, microlens-th
+, mtl, parsec, stm, terminfo, transformers, unix, utf8-string
+, vector, vty
+}:
+mkDerivation {
+  pname = "vty-unix";
+  version = "0.1.0.0";
+  sha256 = "7faa08b40b6dae02abe518c87b7003876b2e988b620e0b73877bb506383c1295";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    base blaze-builder bytestring containers deepseq microlens
+    microlens-mtl microlens-th mtl parsec stm terminfo transformers
+    unix utf8-string vector vty
+  ];
+  executableHaskellDepends = [ ansi-terminal base vty ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  description = "Unix backend for Vty";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/vty.nix b/pkgs/vty.nix
deleted file mode 100644
index 4ad9e083d66e15747318296ba41d544112171c9c..0000000000000000000000000000000000000000
--- a/pkgs/vty.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, ansi-terminal, base, binary, blaze-builder
-, bytestring, containers, deepseq, directory, filepath, lib
-, microlens, microlens-mtl, microlens-th, mtl, parsec, stm
-, terminfo, text, transformers, unix, utf8-string, vector
-}:
-mkDerivation {
-  pname = "vty";
-  version = "5.38";
-  sha256 = "54812f4d6f20d5c6308dd0b8279be6b94988e6a32813c1902c15b6c0722648a3";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal base binary blaze-builder bytestring containers
-    deepseq directory filepath microlens microlens-mtl microlens-th mtl
-    parsec stm terminfo text transformers unix utf8-string vector
-  ];
-  executableHaskellDepends = [
-    base containers directory filepath microlens microlens-mtl mtl
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jtdaugherty/vty";
-  description = "A simple terminal UI library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wai-app-static.nix b/pkgs/wai-app-static.nix
index 1520defaa555ce47d7348bdf528f880a7f27776b..ae1a89ff3faf6af3f5f7d38bb60da4a8895b95b4 100644
--- a/pkgs/wai-app-static.nix
+++ b/pkgs/wai-app-static.nix
@@ -1,31 +1,28 @@
 { mkDerivation, base, blaze-html, blaze-markup, bytestring
-, containers, cryptonite, directory, file-embed, filepath, hspec
-, http-date, http-types, lib, memory, mime-types, mockery, network
+, containers, crypton, directory, file-embed, filepath, hspec
+, http-date, http-types, lib, memory, mime-types, mockery
 , old-locale, optparse-applicative, template-haskell, temporary
 , text, time, transformers, unix-compat, unordered-containers, wai
 , wai-extra, warp, zlib
 }:
 mkDerivation {
   pname = "wai-app-static";
-  version = "3.1.7.4";
-  sha256 = "647188444b19dc953bbfbab5611c81c1e1f27c31bac5dc31dd5de27cdbf01fc1";
+  version = "3.1.8";
+  sha256 = "1a7081096bd425533d87fc40eca7a0f3ed3e3eb08c3a7ef93eecc6f1cf012f02";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base blaze-html blaze-markup bytestring containers cryptonite
+    base blaze-html blaze-markup bytestring containers crypton
     directory file-embed filepath http-date http-types memory
     mime-types old-locale optparse-applicative template-haskell text
     time transformers unix-compat unordered-containers wai wai-extra
     warp zlib
   ];
-  executableHaskellDepends = [
-    base bytestring containers directory mime-types text
-  ];
+  executableHaskellDepends = [ base ];
   testHaskellDepends = [
     base bytestring filepath hspec http-date http-types mime-types
-    mockery network old-locale temporary text time transformers
-    unix-compat wai wai-extra zlib
+    mockery temporary text transformers unix-compat wai wai-extra zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/wai-conduit.nix b/pkgs/wai-conduit.nix
deleted file mode 100644
index 990bb102d1832bc390411cf9771fd1a349dd24af..0000000000000000000000000000000000000000
--- a/pkgs/wai-conduit.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, bytestring, conduit, http-types, lib
-, transformers, wai
-}:
-mkDerivation {
-  pname = "wai-conduit";
-  version = "3.0.0.4";
-  sha256 = "2790093bd52892b8087c295044573c720773144f4061ccc72d6d6a617320d61f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring conduit http-types transformers wai
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/wai";
-  description = "conduit wrappers for WAI";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wai-logger.nix b/pkgs/wai-logger.nix
deleted file mode 100644
index 9a26ab082a856677e61813fcee095f21a55641c0..0000000000000000000000000000000000000000
--- a/pkgs/wai-logger.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, Cabal, base, byteorder, bytestring, cabal-doctest
-, doctest, fast-logger, http-types, lib, network, wai
-}:
-mkDerivation {
-  pname = "wai-logger";
-  version = "2.4.0";
-  sha256 = "057e635acd35a39d6ddae4ba4c5dfa1425e251579bbd3239c7f4b557bc96290a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    base byteorder bytestring fast-logger http-types network wai
-  ];
-  testHaskellDepends = [ base doctest ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "A logging system for WAI";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wai-middleware-static.nix b/pkgs/wai-middleware-static.nix
index 4afbbba532159b1fae8f19936088d8df657be273..13c392af71225fdbaf439388056a7984e0969ecf 100644
--- a/pkgs/wai-middleware-static.nix
+++ b/pkgs/wai-middleware-static.nix
@@ -8,8 +8,8 @@ mkDerivation {
   pname = "wai-middleware-static";
   version = "0.9.2";
   sha256 = "6c0c87558f04807896377535f7801a16b4ddfd9de1a203ef5a45de915907d5fa";
-  revision = "1";
-  editedCabalFile = "1zran8wpwizrwdw23a5qckmiplyk6xf2z8x4his0ipfy2zzl5ql6";
+  revision = "4";
+  editedCabalFile = "0kmy18qq2mc5mlmnx6xaj1wkk63jl0s4fn16zbd6cyb6jb8n2lq4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/wai.nix b/pkgs/wai.nix
deleted file mode 100644
index 791fed1257f4dc0a391bbd99541e43a7a6b7531d..0000000000000000000000000000000000000000
--- a/pkgs/wai.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, hspec, hspec-discover, http-types
-, lib, network, text, vault
-}:
-mkDerivation {
-  pname = "wai";
-  version = "3.2.3";
-  sha256 = "5574d6541000988fe204d3032db87fd0a5404cdbde33ee4fa02e6006768229f8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring http-types network text vault
-  ];
-  testHaskellDepends = [ base bytestring hspec ];
-  testToolDepends = [ hspec-discover ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/wai";
-  description = "Web Application Interface";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/warp-tls.nix b/pkgs/warp-tls.nix
index 2d4b28186f4b09f411ef82d8e34ab22ebe3de401..0ef5e984b2539221a2ee5814de8265e02a13f8c9 100644
--- a/pkgs/warp-tls.nix
+++ b/pkgs/warp-tls.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, base, bytestring, cryptonite, data-default-class
-, lib, network, recv, streaming-commons, tls, tls-session-manager
-, unliftio, wai, warp
+{ mkDerivation, base, bytestring, data-default-class, lib, network
+, recv, streaming-commons, tls, tls-session-manager, unliftio, wai
+, warp
 }:
 mkDerivation {
   pname = "warp-tls";
-  version = "3.3.6";
-  sha256 = "ae8070500bfb81b256630b0f792451b26265b9eb1f2ba6d1696cf9ed96965bb5";
+  version = "3.4.3";
+  sha256 = "4d82c2f8b63428d7dca252d912ae42e58330b9a39979890fdd218b7e5a638dba";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring cryptonite data-default-class network recv
-    streaming-commons tls tls-session-manager unliftio wai warp
+    base bytestring data-default-class network recv streaming-commons
+    tls tls-session-manager unliftio wai warp
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/warp.nix b/pkgs/warp.nix
index e608e29e5f8b52d8d4182cefb3121fc1b43aee09..91a5a7c7d87cbbc788aa306108e775cf0b29bf0a 100644
--- a/pkgs/warp.nix
+++ b/pkgs/warp.nix
@@ -1,35 +1,35 @@
 { mkDerivation, QuickCheck, array, auto-update, base
 , bsb-http-chunked, bytestring, case-insensitive, containers
-, directory, gauge, ghc-prim, hashable, hspec, hspec-discover
-, http-client, http-date, http-types, http2, iproute, lib, network
-, process, recv, simple-sendfile, stm, streaming-commons, text
-, time-manager, unix, unix-compat, unliftio, vault, wai, word8
-, x509
+, crypton-x509, directory, gauge, ghc-prim, hashable, hspec
+, hspec-discover, http-client, http-date, http-types, http2
+, iproute, lib, network, process, recv, simple-sendfile, stm
+, streaming-commons, text, time-manager, unix, unliftio, vault, wai
+, word8
 }:
 mkDerivation {
   pname = "warp";
-  version = "3.3.25";
-  sha256 = "ea7d18f031898b5d8d0fa2306ed27a08d6b0a3dc223f84961423aab36d1446f1";
+  version = "3.3.30";
+  sha256 = "ef2e5a25284d712ecb23ce34e222dc6bf95496bb931da9d508801f9bd8b6aec4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     array auto-update base bsb-http-chunked bytestring case-insensitive
-    containers ghc-prim hashable http-date http-types http2 iproute
-    network recv simple-sendfile stm streaming-commons text
-    time-manager unix unix-compat unliftio vault wai word8 x509
+    containers crypton-x509 ghc-prim hashable http-date http-types
+    http2 iproute network recv simple-sendfile stm streaming-commons
+    text time-manager unix unliftio vault wai word8
   ];
   testHaskellDepends = [
     array auto-update base bsb-http-chunked bytestring case-insensitive
-    containers directory ghc-prim hashable hspec http-client http-date
-    http-types http2 iproute network process QuickCheck recv
-    simple-sendfile stm streaming-commons text time-manager unix
-    unix-compat unliftio vault wai word8 x509
+    containers crypton-x509 directory ghc-prim hashable hspec
+    http-client http-date http-types http2 iproute network process
+    QuickCheck recv simple-sendfile stm streaming-commons text
+    time-manager unix unliftio vault wai word8
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    auto-update base bytestring containers gauge hashable http-date
-    http-types network recv time-manager unix unix-compat unliftio x509
+    auto-update base bytestring containers crypton-x509 gauge hashable
+    http-date http-types network recv time-manager unix unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/weigh.nix b/pkgs/weigh.nix
deleted file mode 100644
index 60ee668d4b37e342f0fb526081de03edfae041b3..0000000000000000000000000000000000000000
--- a/pkgs/weigh.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, deepseq, ghc, lib, mtl, process, split
-, temporary
-}:
-mkDerivation {
-  pname = "weigh";
-  version = "0.0.16";
-  sha256 = "a92a19209b6e8999be21fed8c6ddad8cddf5b98352341b58d2c3e3ef4e96eb8e";
-  revision = "1";
-  editedCabalFile = "0y71p1fg2q9ig955b21fhfaipdamdrlzfl302prqz8g0sfcxvmfg";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base deepseq ghc mtl process split temporary
-  ];
-  testHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fpco/weigh#readme";
-  description = "Measure allocations of a Haskell functions/values";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wide-word.nix b/pkgs/wide-word.nix
index c48db26e27e53e63bd16f1649f78c279f2b1a671..25f5165744b80c6bf982df83e0ec60ff38ea6d28 100644
--- a/pkgs/wide-word.nix
+++ b/pkgs/wide-word.nix
@@ -4,10 +4,8 @@
 }:
 mkDerivation {
   pname = "wide-word";
-  version = "0.1.5.0";
-  sha256 = "a732e9fe6eb2c52c744e2250c908126eee4f558ca2d2117a5e6b48023b5b41c0";
-  revision = "2";
-  editedCabalFile = "1zq74zgh82zcxnn9knha6qn36k4sqm93mcck45h8pd6c7yzfc0jx";
+  version = "0.1.6.0";
+  sha256 = "df6aa01a18d2b191f96793fab1cb4b43d465f8c9ad5239f9df4ca9255b059797";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/witherable.nix b/pkgs/witherable.nix
deleted file mode 100644
index d85f6a3a94226c4db6f0c3c37ae5e42bf99eff0c..0000000000000000000000000000000000000000
--- a/pkgs/witherable.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ mkDerivation, QuickCheck, base, base-orphans, containers
-, hashable, indexed-traversable, indexed-traversable-instances, lib
-, quickcheck-instances, tasty, tasty-quickcheck, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "witherable";
-  version = "0.4.2";
-  sha256 = "790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104";
-  revision = "4";
-  editedCabalFile = "1f6kb8cslgqq4x3mbg1gcxfbd9qb5a8hmrv802mm7zzhbnridiff";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base base-orphans containers hashable indexed-traversable
-    indexed-traversable-instances transformers unordered-containers
-    vector
-  ];
-  testHaskellDepends = [
-    base containers hashable QuickCheck quickcheck-instances tasty
-    tasty-quickcheck transformers unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/fumieval/witherable";
-  description = "filterable traversable";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wizards.nix b/pkgs/wizards.nix
index 5dac9ceec1f8e6e97deb015f76b768b0cd0a8434..4b4d1544536598e504bf8efa03f3ca8f658e1d73 100644
--- a/pkgs/wizards.nix
+++ b/pkgs/wizards.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "wizards";
   version = "1.0.3";
   sha256 = "05650d7bf6dd0e6b87d0d7da6fb003601ce5d7b1f3d69571127ec3c9425b9bb2";
-  revision = "1";
-  editedCabalFile = "095qd17zrdhqmcvmslbyzfa5sh9glvvsnsvnlz31gzsmi8nnsgim";
+  revision = "2";
+  editedCabalFile = "0bnqz6slm3hr98ihhlkmivcd12bda6lf0j7l6dfdz30fl4xqpijl";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/wl-pprint-annotated.nix b/pkgs/wl-pprint-annotated.nix
deleted file mode 100644
index 44c8547d04b7510a44f337103617c2e16dc1e9ba..0000000000000000000000000000000000000000
--- a/pkgs/wl-pprint-annotated.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, containers, deepseq, lib, tasty, tasty-hunit
-, text
-}:
-mkDerivation {
-  pname = "wl-pprint-annotated";
-  version = "0.1.0.1";
-  sha256 = "6b662b244b2e318a2923dc7057d707369a29ea4a0e721b4710eac7239cc727af";
-  revision = "1";
-  editedCabalFile = "1qizgsiqsraj8w0qndcyw7grcmiylx63vp3lgw2dplchva8p3hp7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers deepseq text ];
-  testHaskellDepends = [
-    base containers deepseq tasty tasty-hunit text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/minad/wl-pprint-annotated#readme";
-  description = "Pretty printer with annotation support";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/word-wrap.nix b/pkgs/word-wrap.nix
deleted file mode 100644
index 8ec6ac1ad61b6d4b27fdeb4972b6bdef202078e9..0000000000000000000000000000000000000000
--- a/pkgs/word-wrap.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, criterion, hspec, lib, text }:
-mkDerivation {
-  pname = "word-wrap";
-  version = "0.5";
-  sha256 = "f85f29ce003ca3e195ec95d49e350dfb713bf71db726270143375df2c610a744";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [ base hspec ];
-  benchmarkHaskellDepends = [ base criterion text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/jtdaugherty/word-wrap/";
-  description = "A library for word-wrapping";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/word8.nix b/pkgs/word8.nix
deleted file mode 100644
index cfd312d87b85ba027fb7f26ebcf1f1db9bd21eef..0000000000000000000000000000000000000000
--- a/pkgs/word8.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, bytestring, criterion, hspec, lib }:
-mkDerivation {
-  pname = "word8";
-  version = "0.1.3";
-  sha256 = "2630934c75728bfbf390c1f0206b225507b354f68d4047b06c018a36823b5d8a";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
-  testHaskellDepends = [ base hspec ];
-  benchmarkHaskellDepends = [ base bytestring criterion ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Word8 library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/wreq.nix b/pkgs/wreq.nix
index 3ad77d4e507373d1b4117c9c49505e7c9da54746..c188c0c0fa73a939ffe07b1a902be314d8e6cad1 100644
--- a/pkgs/wreq.nix
+++ b/pkgs/wreq.nix
@@ -11,8 +11,8 @@
 }:
 mkDerivation {
   pname = "wreq";
-  version = "0.5.4.0";
-  sha256 = "c528617d5aeab9aa60463221f4ed21a24090dfd8d015bb67e2959bfc938ac471";
+  version = "0.5.4.2";
+  sha256 = "901b28b04ad186be48b1b91fd2172053fac3c91bfdb70dc79fb65b80642cd504";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
diff --git a/pkgs/wuss.nix b/pkgs/wuss.nix
index adeafec73fa24c48345ea3d72f74166c8f662070..57ccde0fe3c14564fb141f9b68d65b815674bef2 100644
--- a/pkgs/wuss.nix
+++ b/pkgs/wuss.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, base, bytestring, connection, exceptions, lib
-, network, websockets
+{ mkDerivation, base, bytestring, crypton-connection, exceptions
+, lib, network, websockets
 }:
 mkDerivation {
   pname = "wuss";
-  version = "2.0.1.3";
-  sha256 = "67501f9d44cfc6804494952772d03eaf0c1baea6f827179df8b5dc5c49d7ed0c";
+  version = "2.0.1.4";
+  sha256 = "5b7dbd2e9b1676fb663833249db1c21618fe8521f88fecc5abf2975e8fcca442";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring connection exceptions network websockets
+    base bytestring crypton-connection exceptions network websockets
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
diff --git a/pkgs/x509-store.nix b/pkgs/x509-store.nix
deleted file mode 100644
index 147fd0df253fb064a2d00fd99dd47ed32c6d7aed..0000000000000000000000000000000000000000
--- a/pkgs/x509-store.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-, containers, cryptonite, directory, filepath, lib, mtl, pem, tasty
-, tasty-hunit, x509
-}:
-mkDerivation {
-  pname = "x509-store";
-  version = "1.6.9";
-  sha256 = "c59213520cf31a0a18611a60b8a4d2d7aa6cb206c0545d857b98dcb90fc5c8da";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    asn1-encoding asn1-types base bytestring containers cryptonite
-    directory filepath mtl pem x509
-  ];
-  testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-certificate";
-  description = "X.509 collection accessing and storing methods";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/x509-system.nix b/pkgs/x509-system.nix
deleted file mode 100644
index d0d7184007bba46682d7717aac3ff48196ac0eb0..0000000000000000000000000000000000000000
--- a/pkgs/x509-system.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, base, bytestring, containers, directory, filepath
-, lib, mtl, pem, process, x509, x509-store
-}:
-mkDerivation {
-  pname = "x509-system";
-  version = "1.6.7";
-  sha256 = "68fc1ffd9b33fc85886934a39f12064ef465b12043503fe1b489c098bb6a2b11";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base bytestring containers directory filepath mtl pem process x509
-    x509-store
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-certificate";
-  description = "Handle per-operating-system X.509 accessors and storage";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/x509-validation.nix b/pkgs/x509-validation.nix
deleted file mode 100644
index 4b3743c8cf837c9978004854978845f0aa735543..0000000000000000000000000000000000000000
--- a/pkgs/x509-validation.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-, containers, cryptonite, data-default-class, hourglass, lib
-, memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
-}:
-mkDerivation {
-  pname = "x509-validation";
-  version = "1.6.12";
-  sha256 = "0d8e44e199332b22df3e7c19d21b1a79f237fde9a3abf23bef9e7c4991d0f1c8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    asn1-encoding asn1-types base bytestring containers cryptonite
-    data-default-class hourglass memory mtl pem x509 x509-store
-  ];
-  testHaskellDepends = [
-    asn1-encoding asn1-types base bytestring cryptonite
-    data-default-class hourglass memory tasty tasty-hunit x509
-    x509-store
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-certificate";
-  description = "X.509 Certificate and CRL validation";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/x509.nix b/pkgs/x509.nix
deleted file mode 100644
index b35f1c0bd41f3e3c022746f5ec9e70f2a35ac758..0000000000000000000000000000000000000000
--- a/pkgs/x509.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-, bytestring, containers, cryptonite, hourglass, lib, memory, mtl
-, pem, tasty, tasty-quickcheck, transformers
-}:
-mkDerivation {
-  pname = "x509";
-  version = "1.7.7";
-  sha256 = "59c6920fe5d53f1e6a15176bd853f1a18422be87cd8496772ff4571828a568fe";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    asn1-encoding asn1-parse asn1-types base bytestring containers
-    cryptonite hourglass memory pem transformers
-  ];
-  testHaskellDepends = [
-    asn1-types base bytestring cryptonite hourglass mtl tasty
-    tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/vincenthz/hs-certificate";
-  description = "X509 reader and writer";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/xml-conduit-writer.nix b/pkgs/xml-conduit-writer.nix
index 798669b20d9ea7bef2cf5a87669081ec7aba8638..ff46fe09ef3996519e13bf925525d5105e358cca 100644
--- a/pkgs/xml-conduit-writer.nix
+++ b/pkgs/xml-conduit-writer.nix
@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "xml-conduit-writer";
-  version = "0.1.1.2";
-  sha256 = "0891c05ad2a2de68183868de8f66230d02f209446ee91bca772cbf22b599ae58";
+  version = "0.1.1.4";
+  sha256 = "229dbf3470a6d6f284329373060d8a14ae26ea92eefda53c138024e55f7ac5ba";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix
index 95f0320aa2856e0c3ca370cff9631e56dc5eb395..844c28f833f6751f8d872dca2db4d3d4b28ad619 100644
--- a/pkgs/xml-conduit.nix
+++ b/pkgs/xml-conduit.nix
@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "xml-conduit";
-  version = "1.9.1.2";
-  sha256 = "959b46fa0ba0568fdfdd213070245999244a934ca9a4ab6e30141f2d605648dd";
+  version = "1.9.1.3";
+  sha256 = "d8e9169562c71c9e6bc616f15832f521a68c362aa4fc03682748a809755f1bf4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/xml.nix b/pkgs/xml.nix
deleted file mode 100644
index 47e3dc5d13397004c36dd52d363d50ab6aee4c7f..0000000000000000000000000000000000000000
--- a/pkgs/xml.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, bytestring, lib, text }:
-mkDerivation {
-  pname = "xml";
-  version = "1.3.14";
-  sha256 = "32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d";
-  revision = "2";
-  editedCabalFile = "15cxa19dp8nqvrrp0bmndkdas2jzg573x8ri75r6kiv8r4vkv8y7";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring text ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/GaloisInc/xml";
-  description = "A simple XML library";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/xss-sanitize.nix b/pkgs/xss-sanitize.nix
index 59d00f560c25327ee54d165aaff6901fce3cf823..dc3c6274054373b005f5edf0171f4c6e8fa7cae6 100644
--- a/pkgs/xss-sanitize.nix
+++ b/pkgs/xss-sanitize.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "xss-sanitize";
   version = "0.3.7.2";
   sha256 = "1bbb7f5be1f4590124c76458fb798bfd9bf8114dce338d5881ad89188a9dc946";
+  revision = "1";
+  editedCabalFile = "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/yaml.nix b/pkgs/yaml.nix
deleted file mode 100644
index afd3d15b2c6e1a5b97d15a8243696d5acd940a71..0000000000000000000000000000000000000000
--- a/pkgs/yaml.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ mkDerivation, HUnit, aeson, attoparsec, base, base-compat
-, bytestring, conduit, containers, directory, filepath, hspec, lib
-, libyaml, mockery, mtl, raw-strings-qq, resourcet, scientific
-, template-haskell, temporary, text, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "yaml";
-  version = "0.11.11.0";
-  sha256 = "4c95c00bd2e134cd5c2a9c7032bcadac300fa2b8ed794ac61637a28431580023";
-  configureFlags = [ "-fsystem-libyaml" ];
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson attoparsec base bytestring conduit containers directory
-    filepath libyaml mtl resourcet scientific template-haskell text
-    transformers unordered-containers vector
-  ];
-  testHaskellDepends = [
-    aeson attoparsec base base-compat bytestring conduit containers
-    directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
-    resourcet scientific template-haskell temporary text transformers
-    unordered-containers vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/snoyberg/yaml#readme";
-  description = "Support for parsing and rendering YAML documents";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/zlib.nix b/pkgs/zlib.nix
deleted file mode 100644
index d43b2366499609706dea8d6dd922ecdd6b915f38..0000000000000000000000000000000000000000
--- a/pkgs/zlib.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, base, bytestring, lib, tasty
-, tasty-quickcheck, zlib
-}:
-mkDerivation {
-  pname = "zlib";
-  version = "0.6.3.0";
-  sha256 = "9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da";
-  revision = "1";
-  editedCabalFile = "1z2dyphqmjb9akzqrqh8k82mfv416hqj82nz8mysidx09jgf7p4s";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
-  librarySystemDepends = [ zlib ];
-  testHaskellDepends = [
-    base bytestring QuickCheck tasty tasty-quickcheck
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Compression and decompression in the gzip and zlib formats";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file