diff --git a/flake.lock b/flake.lock
index 622d6f571da3b3270f08fbd231756cf04e0925a4..13c56d7dc68fc25c78349a974349a48d3f5fafaa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,42 +1,5 @@
 {
   "nodes": {
-    "devenv": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nix": "nix",
-        "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": "pre-commit-hooks"
-      },
-      "locked": {
-        "lastModified": 1678720350,
-        "narHash": "sha256-2WUISGDqlshoLgLh2BCqWn0jAcHOnROYtEpgemmxXaQ=",
-        "owner": "cachix",
-        "repo": "devenv",
-        "rev": "b97ca4bd581f0e2fb620f301cc417791f655f851",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "devenv",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -56,21 +19,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -85,63 +33,10 @@
         "type": "github"
       }
     },
-    "get-flake": {
-      "locked": {
-        "lastModified": 1644686428,
-        "narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
-        "owner": "ursi",
-        "repo": "get-flake",
-        "rev": "703f15558daa56dfae19d1858bb3046afe68831a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ursi",
-        "repo": "get-flake",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "devenv",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "horizon-platform": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1678886634,
-        "narHash": "sha256-PkiDQImBu4i9sOKiOIEDMryBGn3ouBZ/H0+mAyOEbLk=",
-        "ref": "refs/heads/master",
-        "rev": "0b3c27cd666315edca0585e82ed6d74f208fff5b",
-        "revCount": 997,
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
-      }
-    },
     "lint-utils": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1670623736,
@@ -157,58 +52,18 @@
         "url": "https://gitlab.homotopic.tech/nix/lint-utils"
       }
     },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1633514407,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": [
-          "devenv",
-          "nixpkgs"
-        ],
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1676545802,
-        "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
-        "owner": "domenkozar",
-        "repo": "nix",
-        "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "domenkozar",
-        "ref": "relaxed-flakes",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678500213,
-        "narHash": "sha256-A5s2rXawJ+dCThkMXoMuYW8dgyUmkElcyfVJUot/Vr0=",
+        "lastModified": 1644525281,
+        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ce9b9842b5e63884dfc3dea6689769e2a1ea309",
+        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -231,55 +86,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1673800717,
-        "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1644525281,
-        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1673947312,
         "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=",
@@ -295,42 +102,11 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "devenv",
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "devenv",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1678376203,
-        "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "devenv": "devenv",
         "flake-parts": "flake-parts",
-        "get-flake": "get-flake",
-        "horizon-platform": "horizon-platform",
         "lint-utils": "lint-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 3e4c9e05c7fd145c3fa1abb492f67bca50a9063a..bbcda025bd1a7102eae5056fa9afdeebe789fde4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,7 @@
   };
 
   inputs = {
-    devenv.url = "github:cachix/devenv";
-    get-flake.url = "github:ursi/get-flake";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    horizon-platform = {
-      url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-platform";
-      flake = false;
-    };
     lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
@@ -22,10 +16,7 @@
   outputs =
     inputs@
     { self
-    , devenv
-    , get-flake
     , flake-parts
-    , horizon-platform
     , lint-utils
     , nixpkgs
     , ...
@@ -35,23 +26,6 @@
       perSystem = { config, system, ... }:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-        in
-        with pkgs.lib;
-        with pkgs.writers;
-        with lint-utils.writers.${system};
-        let
-
-          horizon-platform-prev = get-flake horizon-platform;
-
-          horizon-gen-nix = pkgs.writeShellApplication {
-            name = "horizon-gen-nix";
-            runtimeInputs = with pkgs; [ ghc cabal-install ];
-            text = ''
-              ${horizon-platform-prev.legacyPackages.${system}.horizon-gen-nix}/bin/horizon-gen-nix;
-              ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt pkgs/*
-              ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt initial-packages.nix
-            '';
-          };
 
           haskellLib = pkgs.haskell.lib.compose;
 
@@ -68,7 +42,7 @@
             nonHackagePackages = self: super: { };
           };
 
-          packages = filterAttrs
+          packages = pkgs.lib.filterAttrs
             (n: v: v != null
               && builtins.typeOf v == "set"
               && pkgs.lib.hasAttr "type" v
@@ -82,16 +56,6 @@
           checks = with lint-utils.linters.${system}; {
             dhall-format = dhall-format { src = self; };
             nixpkgs-fmt = nixpkgs-fmt { src = self; find = "flake.nix"; };
-            stylish-haskell = stylish-haskell { src = self; };
-          };
-
-          devShells.default = devenv.lib.mkShell {
-            inherit inputs pkgs;
-            modules = [
-              ({ pkgs, ... }: {
-                packages = [ horizon-gen-nix pkgs.nixpkgs-fmt ];
-              })
-            ];
           };
 
           inherit legacyPackages;
diff --git a/horizon.dhall b/horizon.dhall
index fe7e4084742739cba1b64a3e907c84404c9ecfab..c937addd9a2f415b1718a9b068663e067cc7466b 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -8,43 +8,43 @@ let packages =
       , Cabal-QuickCheck =
           H.callGit
             "https://gitlab.haskell.org/ghc/packages/Cabal"
-            "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+            "6c95f3fee3cdee859704b6476646cefd4628a850"
             (Some "Cabal-QuickCheck/")
       , Cabal-described =
           H.callGit
             "https://gitlab.haskell.org/ghc/packages/Cabal"
-            "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+            "6c95f3fee3cdee859704b6476646cefd4628a850"
             (Some "Cabal-described/")
+      , Cabal-syntax = H.callHackage "Cabal-syntax" "3.10.1.0"
       , Cabal-tree-diff =
           H.callGit
             "https://gitlab.haskell.org/ghc/packages/Cabal"
-            "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+            "6c95f3fee3cdee859704b6476646cefd4628a850"
             (Some "Cabal-tree-diff/")
-      , Cabal-syntax = H.callHackage "Cabal-syntax" "3.10.1.0"
       , Chart = H.callHackage "Chart" "1.9.4"
       , Chart-diagrams = H.callHackage "Chart-diagrams" "1.9.4"
       , ChasingBottoms = H.callHackage "ChasingBottoms" "1.3.1.12"
       , Decimal = H.callHackage "Decimal" "0.5.2"
       , Diff = H.callHackage "Diff" "0.4.1"
       , Glob = H.callHackage "Glob" "0.10.2"
-      , HTF = H.callHackage "HTF" "0.15.0.0"
+      , 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"
       , Hclip = H.callHackage "Hclip" "3.0.0.4"
-      , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.2"
+      , HsOpenSSL = H.callHackage "HsOpenSSL" "0.11.7.5"
       , HsYAML = H.callHackage "HsYAML" "0.2.1.1"
       , JuicyPixels = H.callHackage "JuicyPixels" "3.3.8"
-      , ListLike = H.callHackage "ListLike" "4.7.7"
+      , ListLike = H.callHackage "ListLike" "4.7.8"
       , MemoTrie = H.callHackage "MemoTrie" "0.6.10"
       , MonadPrompt = H.callHackage "MonadPrompt" "1.0.0.5"
-      , MonadRandom = H.callHackage "MonadRandom" "0.5.3"
+      , MonadRandom = H.callHackage "MonadRandom" "0.6"
       , NumInstances = H.callHackage "NumInstances" "1.4"
-      , OneTuple = H.callHackage "OneTuple" "0.3.1"
+      , OneTuple = H.callHackage "OneTuple" "0.4.1.1"
       , 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.0"
+      , PyF = H.callHackage "PyF" "0.11.1.1"
       , QuickCheck = H.callHackage "QuickCheck" "2.14.2"
       , RSA = H.callHackage "RSA" "2.4.1"
       , SHA = H.callHackage "SHA" "1.6.4.4"
@@ -59,7 +59,7 @@ let packages =
       , abstract-par = H.callHackage "abstract-par" "0.3.3"
       , active = H.callHackage "active" "0.2.0.16"
       , adjunctions = H.callHackage "adjunctions" "4.4.2"
-      , aeson = H.callHackage "aeson" "2.1.0.0"
+      , aeson = H.callHackage "aeson" "2.1.2.1"
       , aeson-pretty = H.callHackage "aeson-pretty" "0.8.9"
       , aeson-qq = H.callHackage "aeson-qq" "0.8.4"
       , aeson-yaml = H.callHackage "aeson-yaml" "1.1.0.1"
@@ -67,12 +67,12 @@ let packages =
       , algebraic-graphs = H.callHackage "algebraic-graphs" "0.6.1"
       , alsa-core = H.callHackage "alsa-core" "0.5.0.1"
       , alsa-mixer = H.callHackage "alsa-mixer" "0.3.0"
-      , ansi-terminal = H.callHackage "ansi-terminal" "0.11.3"
+      , ansi-terminal = H.callHackage "ansi-terminal" "0.11.4"
       , ansi-wl-pprint = H.callHackage "ansi-wl-pprint" "0.6.9"
       , ap-normalize = H.callHackage "ap-normalize" "0.1.0.1"
       , apecs = H.callHackage "apecs" "0.9.4"
       , appar = H.callHackage "appar" "0.1.8"
-      , apply-refact = H.callHackage "apply-refact" "0.11.0.0"
+      , apply-refact = H.callHackage "apply-refact" "0.12.0.0"
       , asn1-encoding = H.callHackage "asn1-encoding" "0.9.6"
       , asn1-parse = H.callHackage "asn1-parse" "0.9.5"
       , asn1-types = H.callHackage "asn1-types" "0.3.4"
@@ -86,16 +86,16 @@ let packages =
       , attoparsec-iso8601 = H.callHackage "attoparsec-iso8601" "1.1.0.0"
       , authenticate-oauth = H.callHackage "authenticate-oauth" "1.7"
       , auto-update = H.callHackage "auto-update" "0.1.6"
-      , autodocodec = H.callHackage "autodocodec" "0.2.0.1"
-      , autodocodec-schema = H.callHackage "autodocodec-schema" "0.1.0.2"
+      , autodocodec = H.callHackage "autodocodec" "0.2.0.3"
+      , autodocodec-schema = H.callHackage "autodocodec-schema" "0.1.0.3"
       , autodocodec-servant-multipart =
           H.callHackage "autodocodec-servant-multipart" "0.0.0.0"
-      , autodocodec-yaml = H.callHackage "autodocodec-yaml" "0.2.0.2"
-      , autoexporter = H.callHackage "autoexporter" "2.0.0.2"
-      , barbies = H.callHackage "barbies" "2.0.3.1"
-      , base-compat = H.callHackage "base-compat" "0.12.2"
-      , base-compat-batteries = H.callHackage "base-compat-batteries" "0.12.2"
-      , base-orphans = H.callHackage "base-orphans" "0.8.7"
+      , autodocodec-yaml = H.callHackage "autodocodec-yaml" "0.2.0.3"
+      , autoexporter = H.callHackage "autoexporter" "2.0.0.8"
+      , barbies = H.callHackage "barbies" "2.0.4.0"
+      , base-compat = H.callHackage "base-compat" "0.13.0"
+      , base-compat-batteries = H.callHackage "base-compat-batteries" "0.13.0"
+      , base-orphans = H.callHackage "base-orphans" "0.9.0"
       , base-prelude = H.callHackage "base-prelude" "1.6.1"
       , base16-bytestring = H.callHackage "base16-bytestring" "1.0.2.0"
       , base58-bytestring = H.callHackage "base58-bytestring" "0.1.0"
@@ -128,16 +128,16 @@ let packages =
       , bifunctors = H.callHackage "bifunctors" "5.6.1"
       , bimap = H.callHackage "bimap" "0.5.0"
       , bin = H.callHackage "bin" "0.1.2"
-      , binary-orphans = H.callHackage "binary-orphans" "1.0.3"
+      , binary-orphans = H.callHackage "binary-orphans" "1.0.4.1"
       , bitvec = H.callHackage "bitvec" "1.1.3.0"
       , blaze-builder = H.callHackage "blaze-builder" "0.4.2.2"
       , blaze-html = H.callHackage "blaze-html" "0.9.1.2"
       , blaze-markup = H.callHackage "blaze-markup" "0.8.2.8"
       , blaze-svg = H.callHackage "blaze-svg" "0.3.6.1"
-      , blaze-textual = H.callHackage "blaze-textual" "0.2.2.1"
-      , boring = H.callHackage "boring" "0.2"
-      , breakpoint = H.callHackage "breakpoint" "0.1.1.1"
-      , brick = H.callHackage "brick" "1.3"
+      , blaze-textual = H.callHackage "blaze-textual" "0.2.3.1"
+      , boring = H.callHackage "boring" "0.2.1"
+      , breakpoint = H.callHackage "breakpoint" "0.1.2.1"
+      , brick = H.callHackage "brick" "1.6"
       , bsb-http-chunked = H.callHackage "bsb-http-chunked" "0.0.0.4"
       , byteable = H.callHackage "byteable" "0.1.1"
       , byteorder = H.callHackage "byteorder" "1.0.4"
@@ -165,18 +165,20 @@ let packages =
       , chell = H.callHackage "chell" "0.5.0.1"
       , chell-quickcheck = H.callHackage "chell-quickcheck" "0.2.5.3"
       , circle-packing = H.callHackage "circle-packing" "0.1.0.6"
-      , citeproc = H.callHackage "citeproc" "0.8.0.1"
+      , citeproc = H.callHackage "citeproc" "0.8.1"
       , clock = H.callHackage "clock" "0.8.3"
       , cmark-gfm = H.callHackage "cmark-gfm" "0.2.5"
-      , cmdargs = H.callHackage "cmdargs" "0.10.21"
-      , co-log-core = H.callHackage "co-log-core" "0.3.1.0"
+      , cmdargs = H.callHackage "cmdargs" "0.10.22"
+      , co-log-core = H.callHackage "co-log-core" "0.3.2.0"
       , co-log-polysemy = H.callHackage "co-log-polysemy" "0.0.1.3"
       , code-page = H.callHackage "code-page" "0.2.1"
       , colour = H.callHackage "colour" "2.3.6"
-      , colourista = H.callHackage "colourista" "0.1.0.1"
+      , colourista = H.callHackage "colourista" "0.1.0.2"
       , commonmark = H.callHackage "commonmark" "0.2.2"
-      , commonmark-extensions = H.callHackage "commonmark-extensions" "0.2.3.3"
-      , commonmark-pandoc = H.callHackage "commonmark-pandoc" "0.2.1.2"
+      , commonmark-extensions = H.callHackage "commonmark-extensions" "0.2.3.4"
+      , commonmark-pandoc = H.callHackage "commonmark-pandoc" "0.2.1.3"
+      , commutative-semigroups =
+          H.callHackage "commutative-semigroups" "0.1.0.0"
       , comonad = H.callHackage "comonad" "5.0.8"
       , compact = H.callHackage "compact" "0.2.0.0"
       , compactable =
@@ -184,7 +186,7 @@ let packages =
             "https://gitlab.com/fresheyeball/Compactable"
             "f63927b1e438c267f0d12f36e5b3735cfaebeeb4"
             (None H.Subdir)
-      , composite-base = H.callHackage "composite-base" "0.8.1.0"
+      , composite-base = H.callHackage "composite-base" "0.8.2.1"
       , composite-cassava = H.callHackage "composite-cassava" "0.0.3.1"
       , composite-dhall = H.callHackage "composite-dhall" "0.1.0.1"
       , composite-lens-extra = H.callHackage "composite-lens-extra" "0.1.0.0"
@@ -192,21 +194,21 @@ let packages =
       , composition-prelude = H.callHackage "composition-prelude" "3.0.0.2"
       , concise = H.callHackage "concise" "0.1.0.1"
       , concurrent-extra = H.callHackage "concurrent-extra" "0.7.0.12"
-      , concurrent-output = H.callHackage "concurrent-output" "1.10.16"
-      , conduit = H.callHackage "conduit" "1.3.4.2"
+      , concurrent-output = H.callHackage "concurrent-output" "1.10.17"
+      , conduit = H.callHackage "conduit" "1.3.4.3"
       , conduit-combinators = H.callHackage "conduit-combinators" "1.3.0"
       , conduit-extra = H.callHackage "conduit-extra" "1.3.6"
       , conduit-parse = H.callHackage "conduit-parse" "0.2.1.1"
       , config-ini = H.callHackage "config-ini" "0.2.5.0"
       , connection = H.callHackage "connection" "0.3.1"
       , constraints = H.callHackage "constraints" "0.13.4"
-      , constraints-extras = H.callHackage "constraints-extras" "0.3.2.1"
+      , constraints-extras = H.callHackage "constraints-extras" "0.4.0.0"
       , contravariant = H.callHackage "contravariant" "1.5.5"
       , control-monad-free = H.callHackage "control-monad-free" "0.6.2"
-      , cookie = H.callHackage "cookie" "0.4.5"
+      , cookie = H.callHackage "cookie" "0.4.6"
       , cpphs = H.callHackage "cpphs" "1.20.9.1"
-      , criterion = H.callHackage "criterion" "1.5.13.0"
-      , criterion-measurement = H.callHackage "criterion-measurement" "0.2.0.0"
+      , criterion = H.callHackage "criterion" "1.6.0.0"
+      , criterion-measurement = H.callHackage "criterion-measurement" "0.2.1.0"
       , crypto-api = H.callHackage "crypto-api" "0.13.3"
       , crypto-api-tests = H.callHackage "crypto-api-tests" "0.3"
       , crypto-pubkey-types = H.callHackage "crypto-pubkey-types" "0.4.3"
@@ -260,15 +262,15 @@ let packages =
       , dbus = H.callHackage "dbus" "1.2.27"
       , dec = H.callHackage "dec" "0.0.5"
       , deepseq-generics = H.callHackage "deepseq-generics" "0.2.0.0"
-      , deferred-folds = H.callHackage "deferred-folds" "0.9.18.2"
+      , deferred-folds = H.callHackage "deferred-folds" "0.9.18.3"
       , 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.1.0"
+      , dependent-sum = H.callHackage "dependent-sum" "0.7.2.0"
       , dependent-sum-template =
           H.callHackage "dependent-sum-template" "0.1.1.1"
       , deque = H.callHackage "deque" "0.4.4"
-      , deriving-aeson = H.callHackage "deriving-aeson" "0.2.8"
-      , deriving-compat = H.callHackage "deriving-compat" "0.6.1"
+      , deriving-aeson = H.callHackage "deriving-aeson" "0.2.9"
+      , deriving-compat = H.callHackage "deriving-compat" "0.6.3"
       , derp = H.callHackage "derp" "0.1.6"
       , dhall = H.callHackage "dhall" "1.41.2"
       , dhall-docs = H.callHackage "dhall-docs" "1.0.10"
@@ -277,34 +279,34 @@ let packages =
       , diagrams-contrib = H.callHackage "diagrams-contrib" "1.4.5"
       , diagrams-core = H.callHackage "diagrams-core" "1.5.0.1"
       , diagrams-lib = H.callHackage "diagrams-lib" "1.4.5.3"
-      , diagrams-postscript = H.callHackage "diagrams-postscript" "1.5.1"
+      , 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"
       , dictionary-sharing = H.callHackage "dictionary-sharing" "0.1.0.0"
-      , digest = H.callHackage "digest" "0.0.1.3"
+      , digest = H.callHackage "digest" "0.0.1.7"
       , dimensional = H.callHackage "dimensional" "1.5"
-      , direct-sqlite = H.callHackage "direct-sqlite" "2.3.27"
+      , direct-sqlite = H.callHackage "direct-sqlite" "2.3.28"
       , dirforest =
           H.callGit
             "https://github.com/NorfairKing/dirforest"
             "69e8ae036b047fae105c1fe990e175a7572a3eba"
             (Some "dirforest/")
-      , distribution-nixpkgs = H.callHackage "distribution-nixpkgs" "1.7.0"
+      , distribution-nixpkgs = H.callHackage "distribution-nixpkgs" "1.7.0.1"
       , distributive = H.callHackage "distributive" "0.6.2.1"
       , dlist = H.callHackage "dlist" "1.0"
       , dns = H.callHackage "dns" "4.1.0"
       , doclayout = H.callHackage "doclayout" "0.4"
-      , doctemplates = H.callHackage "doctemplates" "0.10.0.2"
+      , doctemplates = H.callHackage "doctemplates" "0.11"
       , doctest = H.callHackage "doctest" "0.21.1"
       , doctest-discover = H.callHackage "doctest-discover" "0.2.0.0"
       , doctest-exitcode-stdio = H.callHackage "doctest-exitcode-stdio" "0.0"
       , doctest-lib = H.callHackage "doctest-lib" "0.1"
-      , doctest-parallel = H.callHackage "doctest-parallel" "0.2.5"
+      , doctest-parallel = H.callHackage "doctest-parallel" "0.3.0.1"
       , dom-lt = H.callHackage "dom-lt" "0.2.3"
       , dotgen = H.callHackage "dotgen" "0.4.3"
       , double-conversion = H.callHackage "double-conversion" "2.0.4.2"
       , dual-tree = H.callHackage "dual-tree" "0.2.3.1"
-      , easy-file = H.callHackage "easy-file" "0.2.2"
+      , easy-file = H.callHackage "easy-file" "0.2.3"
       , echo = H.callHackage "echo" "0.1.4"
       , ed25519 =
           H.callGit
@@ -312,14 +314,14 @@ let packages =
             "faf8fe90aa1cd2492ea1e64c55f5c59fc0322210"
             (None H.Subdir)
       , edit-distance = H.callHackage "edit-distance" "0.2.2.1"
-      , effectful = H.callHackage "effectful" "2.1.0.0"
+      , effectful = H.callHackage "effectful" "2.2.2.0"
       , effectful-cache =
           H.callGit
             "https://github.com/haskell-effectful/cache-effectful"
             "0a5581da7c21a05a9ab1762a6da6997090fe311d"
             (None H.Subdir)
-      , effectful-core = H.callHackage "effectful-core" "2.1.0.0"
-      , effectful-th = H.callHackage "effectful-th" "1.0.0.0"
+      , effectful-core = H.callHackage "effectful-core" "2.2.2.2"
+      , effectful-th = H.callHackage "effectful-th" "1.0.0.1"
       , either = H.callHackage "either" "5.0.2"
       , ekg = H.callHackage "ekg" "0.4.0.15"
       , ekg-core = H.callHackage "ekg-core" "0.1.1.7"
@@ -331,7 +333,7 @@ let packages =
       , 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.16"
+      , email-validate = H.callHackage "email-validate" "2.3.2.18"
       , emojis = H.callHackage "emojis" "0.1.2"
       , enclosed-exceptions = H.callHackage "enclosed-exceptions" "1.0.3"
       , entropy = H.callHackage "entropy" "0.4.1.10"
@@ -349,7 +351,7 @@ let packages =
       , fail = H.callHackage "fail" "4.9.0.0"
       , fast-logger = H.callHackage "fast-logger" "3.2.1"
       , fast-math = H.callHackage "fast-math" "1.0.2"
-      , fcf-containers = H.callHackage "fcf-containers" "0.7.1"
+      , fcf-containers = H.callHackage "fcf-containers" "0.8.0"
       , feedback = H.callHackage "feedback" "0.1.0.1"
       , file-embed = H.callHackage "file-embed" "0.0.15.0"
       , file-embed-lzma = H.callHackage "file-embed-lzma" "0.0.1"
@@ -374,13 +376,13 @@ let packages =
       , focus = H.callHackage "focus" "1.0.3"
       , foldable1-classes-compat =
           H.callHackage "foldable1-classes-compat" "0.1"
-      , foldl = H.callHackage "foldl" "1.4.12"
+      , foldl = H.callHackage "foldl" "1.4.14"
       , force-layout = H.callHackage "force-layout" "0.4.0.6"
       , foreign-store = H.callHackage "foreign-store" "0.2"
-      , formatting = H.callHackage "formatting" "7.1.3"
+      , formatting = H.callHackage "formatting" "7.2.0"
       , foundation = H.callHackage "foundation" "0.0.29"
       , fourmolu = H.callHackage "fourmolu" "0.10.1.0"
-      , free = H.callHackage "free" "5.1.9"
+      , free = H.callHackage "free" "5.2"
       , 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"
@@ -389,8 +391,8 @@ let packages =
       , fuzzy-time = H.callHackage "fuzzy-time" "0.2.0.3"
       , fuzzy-time-gen = H.callHackage "fuzzy-time-gen" "0.2.0.1"
       , generic-arbitrary = H.callHackage "generic-arbitrary" "1.0.1"
-      , generic-data = H.callHackage "generic-data" "1.0.0.0"
-      , generic-deriving = H.callHackage "generic-deriving" "1.14.2"
+      , generic-data = H.callHackage "generic-data" "1.1.0.0"
+      , generic-deriving = H.callHackage "generic-deriving" "1.14.3"
       , generic-lens = H.callHackage "generic-lens" "2.2.1.0"
       , generic-lens-core = H.callHackage "generic-lens-core" "2.2.1.0"
       , generic-lens-lite = H.callHackage "generic-lens-lite" "0.1"
@@ -398,7 +400,7 @@ let packages =
       , generic-optics = H.callHackage "generic-optics" "2.2.1.0"
       , generic-optics-lite = H.callHackage "generic-optics-lite" "0.1"
       , generic-random = H.callHackage "generic-random" "1.5.0.1"
-      , generically = H.callHackage "generically" "0.1"
+      , generically = H.callHackage "generically" "0.1.1"
       , generics-sop = H.callHackage "generics-sop" "0.5.1.2"
       , genvalidity = H.callHackage "genvalidity" "1.1.0.0"
       , genvalidity-aeson = H.callHackage "genvalidity-aeson" "1.0.0.1"
@@ -446,13 +448,13 @@ let packages =
       , 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-paths = H.callHackage "ghc-paths" "0.1.0.12"
-      , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.3"
+      , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.4"
       , ghc-trace-events = H.callHackage "ghc-trace-events" "0.1.2.6"
-      , ghc-typelits-knownnat = H.callHackage "ghc-typelits-knownnat" "0.7.7"
+      , ghc-typelits-knownnat = H.callHackage "ghc-typelits-knownnat" "0.7.8"
       , ghc-typelits-natnormalise =
-          H.callHackage "ghc-typelits-natnormalise" "0.7.7"
+          H.callHackage "ghc-typelits-natnormalise" "0.7.8"
       , ghcid = H.callHackage "ghcid" "0.8.8"
-      , ghcide = H.callHackage "ghcide" "1.9.0.0"
+      , ghcide = H.callHackage "ghcide" "1.9.1.0"
       , ghcide-bench = H.callHackage "ghcide-bench" "0.1.1"
       , ghcide-test-utils = H.callHackage "ghcide-test-utils" "1.9.0.0"
       , githash = H.callHackage "githash" "0.1.6.3"
@@ -463,13 +465,12 @@ let packages =
       , hackage-db = H.callHackage "hackage-db" "2.1.2"
       , hackage-security = H.callHackage "hackage-security" "0.6.2.3"
       , haddock-library = H.callHackage "haddock-library" "1.11.0"
-      , hakyll = H.callHackage "hakyll" "4.15.1.1"
       , half = H.callHackage "half" "0.3.1"
       , happy = H.callHackage "happy" "1.20.1.1"
-      , hashable = H.callHackage "hashable" "1.4.1.0"
-      , hashing = H.callHackage "hashing" "0.1.0.1"
+      , hashable = H.callHackage "hashable" "1.4.2.0"
+      , hashing = H.callHackage "hashing" "0.1.1.0"
       , hashmap = H.callHackage "hashmap" "1.3.3"
-      , hashtables = H.callHackage "hashtables" "1.3"
+      , hashtables = H.callHackage "hashtables" "1.3.1"
       , haskell-language-server =
           (H.callHackage "haskell-language-server" "1.9.0.0")
         with flags =
@@ -480,13 +481,13 @@ let packages =
           , H.CabalFlag.Disable "eval"
           , H.CabalFlag.Disable "floskell"
           ]
-      , haskell-lexer = H.callHackage "haskell-lexer" "1.1"
+      , haskell-lexer = H.callHackage "haskell-lexer" "1.1.1"
       , haskell-src = H.callHackage "haskell-src" "1.0.4"
       , haskell-src-exts = H.callHackage "haskell-src-exts" "1.23.1"
       , haskell-src-meta = H.callHackage "haskell-src-meta" "0.8.11"
       , heaps = H.callHackage "heaps" "0.4"
       , hedgehog = H.callHackage "hedgehog" "1.2"
-      , hedgehog-extras = H.callHackage "hedgehog-extras" "0.3.0.3"
+      , hedgehog-extras = H.callHackage "hedgehog-extras" "0.4.0.1"
       , hedgehog-fn = H.callHackage "hedgehog-fn" "1.0"
       , hedgehog-golden =
           H.callGit
@@ -495,13 +496,13 @@ 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.7"
+      , hex-text = H.callHackage "hex-text" "0.1.0.8"
       , hie-bios = H.callHackage "hie-bios" "0.11.0"
-      , hie-compat = H.callHackage "hie-compat" "0.3.0.0"
+      , hie-compat = H.callHackage "hie-compat" "0.3.1.0"
       , hiedb = H.callHackage "hiedb" "0.4.2.0"
       , hinotify = H.callHackage "hinotify" "0.4.1"
-      , hledger = H.callHackage "hledger" "1.27.1"
-      , hledger-lib = H.callHackage "hledger-lib" "1.27.1"
+      , hledger = H.callHackage "hledger" "1.29.1"
+      , hledger-lib = H.callHackage "hledger-lib" "1.29.1"
       , hlint = H.callHackage "hlint" "3.5"
       , hls-alternate-number-format-plugin =
           H.callHackage "hls-alternate-number-format-plugin" "1.3.0.0"
@@ -522,7 +523,7 @@ let packages =
       , hls-fourmolu-plugin = H.callHackage "hls-fourmolu-plugin" "1.1.1.0"
       , hls-gadt-plugin = H.callHackage "hls-gadt-plugin" "1.0.1.0"
       , hls-graph = H.callHackage "hls-graph" "1.9.0.0"
-      , hls-hlint-plugin = H.callHackage "hls-hlint-plugin" "1.1.1.0"
+      , hls-hlint-plugin = H.callHackage "hls-hlint-plugin" "1.1.2.0"
       , hls-module-name-plugin =
           H.callHackage "hls-module-name-plugin" "1.1.1.0"
       , hls-plugin-api = H.callHackage "hls-plugin-api" "1.6.0.0"
@@ -542,7 +543,7 @@ let packages =
             (None H.Subdir)
       , hnix-store-core = H.callHackage "hnix-store-core" "0.6.1.0"
       , hnix-store-remote = H.callHackage "hnix-store-remote" "0.6.0.0"
-      , hopenssl = H.callHackage "hopenssl" "2.2.4"
+      , hopenssl = H.callHackage "hopenssl" "2.2.5"
       , horizon-gen-nix =
           H.callTarball
             "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix/-/archive/0.9.0/horizon-gen-nix-0.9.0.tar.gz"
@@ -559,40 +560,42 @@ let packages =
           H.callTarball
             "https://gitlab.horizon-haskell.net/haskell/horizon-spec-pretty/-/archive/0.1.1/horizon-spec-pretty-0.1.1.tar.gz"
             (Some "horizon-spec-pretty/")
-      , hosc = H.callHackage "hosc" "0.19.1"
+      , hosc = H.callHackage "hosc" "0.20"
       , hostname = H.callHackage "hostname" "1.0"
       , hourglass = H.callHackage "hourglass" "0.2.12"
       , hp2pretty = H.callHackage "hp2pretty" "0.10"
-      , hpack = H.callHackage "hpack" "0.35.0"
+      , hpack = H.callHackage "hpack" "0.35.2"
       , hpack-dhall = H.callHackage "hpack-dhall" "0.5.7"
       , hscolour = H.callHackage "hscolour" "1.24.4"
       , hslogger = H.callHackage "hslogger" "1.3.1.0"
-      , hslua = H.callHackage "hslua" "2.2.1"
-      , hslua-aeson = H.callHackage "hslua-aeson" "2.2.1"
-      , hslua-classes = H.callHackage "hslua-classes" "2.2.0"
-      , hslua-core = H.callHackage "hslua-core" "2.2.1"
-      , hslua-marshalling = H.callHackage "hslua-marshalling" "2.2.1"
-      , hslua-module-doclayout = H.callHackage "hslua-module-doclayout" "1.0.4"
-      , hslua-module-path = H.callHackage "hslua-module-path" "1.0.3"
-      , hslua-module-system = H.callHackage "hslua-module-system" "1.0.2"
-      , hslua-module-text = H.callHackage "hslua-module-text" "1.0.2"
-      , hslua-module-version = H.callHackage "hslua-module-version" "1.0.3"
+      , hslua = H.callHackage "hslua" "2.3.0"
+      , hslua-aeson = H.callHackage "hslua-aeson" "2.3.0.1"
+      , hslua-classes = H.callHackage "hslua-classes" "2.3.0"
+      , hslua-core = H.callHackage "hslua-core" "2.3.1"
+      , hslua-list = H.callHackage "hslua-list" "1.1.1"
+      , hslua-marshalling = H.callHackage "hslua-marshalling" "2.3.0"
+      , hslua-module-doclayout = H.callHackage "hslua-module-doclayout" "1.1.0"
+      , hslua-module-path = H.callHackage "hslua-module-path" "1.1.0"
+      , hslua-module-system = H.callHackage "hslua-module-system" "1.1.0"
+      , hslua-module-text = H.callHackage "hslua-module-text" "1.1.0"
+      , hslua-module-version = H.callHackage "hslua-module-version" "1.1.0"
       , hslua-objectorientation =
-          H.callHackage "hslua-objectorientation" "2.2.1"
-      , hslua-packaging = H.callHackage "hslua-packaging" "2.2.1"
-      , hspec = H.callHackage "hspec" "2.10.3"
+          H.callHackage "hslua-objectorientation" "2.3.0"
+      , hslua-packaging = H.callHackage "hslua-packaging" "2.3.0"
+      , hslua-typing = H.callHackage "hslua-typing" "0.1.0"
+      , hspec = H.callHackage "hspec" "2.10.10"
       , hspec-attoparsec = H.callHackage "hspec-attoparsec" "0.1.0.2"
-      , hspec-contrib = H.callHackage "hspec-contrib" "0.5.1.1"
-      , hspec-core = H.callHackage "hspec-core" "2.10.0.1"
-      , hspec-discover = H.callHackage "hspec-discover" "2.10.0.1"
+      , hspec-contrib = H.callHackage "hspec-contrib" "0.5.2"
+      , hspec-core = H.callHackage "hspec-core" "2.10.10"
+      , hspec-discover = H.callHackage "hspec-discover" "2.10.10"
       , hspec-expectations = H.callHackage "hspec-expectations" "0.8.2"
       , hspec-expectations-lifted =
           H.callHackage "hspec-expectations-lifted" "0.10.0"
-      , hspec-golden = H.callHackage "hspec-golden" "0.2.0.0"
+      , hspec-golden = H.callHackage "hspec-golden" "0.2.0.1"
       , 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-meta = H.callHackage "hspec-meta" "2.9.3"
+      , hspec-meta = H.callHackage "hspec-meta" "2.10.5"
       , hspec-smallcheck = H.callHackage "hspec-smallcheck" "0.5.3"
       , hspec-wai = H.callHackage "hspec-wai" "0.11.1"
       , hsyslog = H.callHackage "hsyslog" "5.0.2"
@@ -608,7 +611,7 @@ let packages =
       , http-media = H.callHackage "http-media" "0.8.0.0"
       , http-streams = H.callHackage "http-streams" "0.8.9.6"
       , http-types = H.callHackage "http-types" "0.12.3"
-      , http2 = H.callHackage "http2" "3.0.3"
+      , http2 = H.callHackage "http2" "4.1.0"
       , httpd-shed = H.callHackage "httpd-shed" "0.4.1.1"
       , hw-aeson = H.callHackage "hw-aeson" "0.1.8.0"
       , hw-fingertree = H.callHackage "hw-fingertree" "0.1.2.1"
@@ -621,35 +624,35 @@ let packages =
       , hxt-unicode = H.callHackage "hxt-unicode" "9.0.2.4"
       , ieee754 = H.callHackage "ieee754" "0.8.0"
       , implicit-hie = H.callHackage "implicit-hie" "0.1.4.0"
-      , implicit-hie-cradle = H.callHackage "implicit-hie-cradle" "0.5.0.0"
-      , incipit-base = H.callHackage "incipit-base" "0.3.0.0"
-      , incipit-core = H.callHackage "incipit-core" "0.3.0.0"
+      , implicit-hie-cradle = H.callHackage "implicit-hie-cradle" "0.5.0.1"
+      , incipit-base = H.callHackage "incipit-base" "0.5.0.0"
+      , incipit-core = H.callHackage "incipit-core" "0.5.0.0"
       , indexed-list-literals = H.callHackage "indexed-list-literals" "0.2.1.3"
       , indexed-profunctors = H.callHackage "indexed-profunctors" "0.1.1"
-      , indexed-traversable = H.callHackage "indexed-traversable" "0.1.2"
+      , indexed-traversable = H.callHackage "indexed-traversable" "0.1.2.1"
       , indexed-traversable-instances =
-          H.callHackage "indexed-traversable-instances" "0.1.1.1"
+          H.callHackage "indexed-traversable-instances" "0.1.1.2"
       , infer-license = H.callHackage "infer-license" "0.2.0"
       , ini = H.callHackage "ini" "0.4.2"
       , inline-c = H.callHackage "inline-c" "0.9.1.6"
-      , inline-r = H.callHackage "inline-r" "1.0.0"
       , insert-ordered-containers =
           H.callHackage "insert-ordered-containers" "0.2.5.1"
-      , inspection-testing = H.callHackage "inspection-testing" "0.5"
+      , inspection-testing = H.callHackage "inspection-testing" "0.5.0.1"
       , 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"
       , interpolate = H.callHackage "interpolate" "0.2.1"
       , intervals = H.callHackage "intervals" "0.9.2"
-      , invariant = H.callHackage "invariant" "0.6"
+      , invariant = H.callHackage "invariant" "0.6.1"
       , io-streams = H.callHackage "io-streams" "1.5.2.2"
       , io-streams-haproxy = H.callHackage "io-streams-haproxy" "1.0.1.0"
       , iproute = H.callHackage "iproute" "1.7.12"
       , 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"
       , iwlib = H.callHackage "iwlib" "0.1.2"
-      , jira-wiki-markup = H.callHackage "jira-wiki-markup" "1.4.0"
-      , jose = H.callHackage "jose" "0.9"
+      , jira-wiki-markup = H.callHackage "jira-wiki-markup" "1.5.1"
+      , jose = H.callHackage "jose" "0.10"
       , js-chart = H.callHackage "js-chart" "2.9.4.1"
       , js-dgtable = H.callHackage "js-dgtable" "0.5.2"
       , js-flot = H.callHackage "js-flot" "0.8.3"
@@ -677,7 +680,7 @@ let packages =
             "https://github.com/haskell-effectful/kvstore-effectful"
             "3502825423aea3a1af9384e9d751feea4599c60b"
             (Some "kvstore-effectful-statemap/")
-      , language-c = H.callHackage "language-c" "0.9.1"
+      , language-c = H.callHackage "language-c" "0.9.2"
       , language-haskell-extract =
           H.callGit
             "https://github.com/chessai/template-helper"
@@ -686,25 +689,25 @@ let packages =
       , language-nix = H.callHackage "language-nix" "2.2.0"
       , lazy-search = H.callHackage "lazy-search" "0.1.3.0"
       , lazysmallcheck = H.callHackage "lazysmallcheck" "0.6"
-      , lens = H.callHackage "lens" "5.2"
-      , lens-aeson = H.callHackage "lens-aeson" "1.2.1"
+      , lens = H.callHackage "lens" "5.2.2"
+      , lens-aeson = H.callHackage "lens-aeson" "1.2.2"
       , lens-family = H.callHackage "lens-family" "2.1.2"
       , lens-family-core = H.callHackage "lens-family-core" "2.1.2"
       , lens-family-th = H.callHackage "lens-family-th" "0.5.2.1"
-      , libsodium = H.callHackage "libsodium" "1.0.18.2"
+      , libsodium = H.callHackage "libsodium" "1.0.18.3"
       , libsystemd-journal = H.callHackage "libsystemd-journal" "1.4.5"
       , libxml = H.callHackage "libxml" "0.1.1"
       , libyaml = H.callHackage "libyaml" "0.1.2"
-      , lift-type = H.callHackage "lift-type" "0.1.0.1"
-      , lifted-async = H.callHackage "lifted-async" "0.10.2.1"
+      , lift-type = H.callHackage "lift-type" "0.1.1.1"
+      , lifted-async = H.callHackage "lifted-async" "0.10.2.4"
       , lifted-base = H.callHackage "lifted-base" "0.2.3.12"
-      , linear = H.callHackage "linear" "1.21.10"
-      , linear-base = H.callHackage "linear-base" "0.3.0"
-      , linear-generics = H.callHackage "linear-generics" "0.2"
-      , list-t = H.callHackage "list-t" "1.0.5.3"
+      , linear = H.callHackage "linear" "1.22"
+      , linear-base = H.callHackage "linear-base" "0.3.1"
+      , linear-generics = H.callHackage "linear-generics" "0.2.1"
+      , list-t = H.callHackage "list-t" "1.0.5.6"
       , list-transformer = H.callHackage "list-transformer" "1.0.9"
       , lockfree-queue = H.callHackage "lockfree-queue" "0.2.4"
-      , log-base = H.callHackage "log-base" "0.12.0.0"
+      , log-base = H.callHackage "log-base" "0.12.0.1"
       , log-effectful =
           H.callGit
             "https://github.com/haskell-effectful/log-effectful/"
@@ -713,13 +716,13 @@ let packages =
       , logging-facade = H.callHackage "logging-facade" "0.3.1"
       , logict = H.callHackage "logict" "0.8.0.0"
       , loop = H.callHackage "loop" "0.3.0"
-      , lpeg = H.callHackage "lpeg" "1.0.3"
+      , lpeg = H.callHackage "lpeg" "1.0.4"
       , 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"
-      , lua = H.callHackage "lua" "2.2.1"
-      , lua-arbitrary = H.callHackage "lua-arbitrary" "1.0.1"
+      , lua = H.callHackage "lua" "2.3.1"
+      , lua-arbitrary = H.callHackage "lua-arbitrary" "1.0.1.1"
       , lucid = H.callHackage "lucid" "2.11.1"
       , lucid-alpine = H.callHackage "lucid-alpine" "0.1.0.7"
       , lucid-aria = H.callHackage "lucid-aria" "0.1.0.1"
@@ -727,7 +730,7 @@ let packages =
       , lukko = H.callHackage "lukko" "0.1.1.3"
       , lvar = H.callHackage "lvar" "0.1.0.0"
       , lzma = H.callHackage "lzma" "0.0.0.4"
-      , managed = H.callHackage "managed" "1.0.9"
+      , managed = H.callHackage "managed" "1.0.10"
       , markdown = H.callHackage "markdown" "0.1.17.5"
       , markdown-unlit = H.callHackage "markdown-unlit" "0.5.1"
       , markov-chain-usage-model =
@@ -735,30 +738,30 @@ let packages =
       , math-functions = H.callHackage "math-functions" "0.3.4.2"
       , matrices = H.callHackage "matrices" "0.5.0"
       , matrix = H.callHackage "matrix" "0.3.6.1"
-      , megaparsec = H.callHackage "megaparsec" "9.2.2"
+      , megaparsec = H.callHackage "megaparsec" "9.3.0"
       , memory = H.callHackage "memory" "0.18.0"
       , mersenne-random = H.callHackage "mersenne-random" "1.0.0.1"
       , mersenne-random-pure64 =
           H.callHackage "mersenne-random-pure64" "0.2.2.0"
       , mfsolve = H.callHackage "mfsolve" "0.3.2.1"
-      , microlens = H.callHackage "microlens" "0.4.13.0"
+      , microlens = H.callHackage "microlens" "0.4.13.1"
       , microlens-aeson = H.callHackage "microlens-aeson" "2.5.0"
-      , microlens-ghc = H.callHackage "microlens-ghc" "0.4.14.0"
-      , microlens-mtl = H.callHackage "microlens-mtl" "0.2.0.2"
-      , microlens-platform = H.callHackage "microlens-platform" "0.4.3.2"
-      , microlens-th = H.callHackage "microlens-th" "0.4.3.10"
+      , microlens-ghc = H.callHackage "microlens-ghc" "0.4.14.1"
+      , microlens-mtl = H.callHackage "microlens-mtl" "0.2.0.3"
+      , microlens-platform = H.callHackage "microlens-platform" "0.4.3.3"
+      , microlens-th = H.callHackage "microlens-th" "0.4.3.11"
       , microspec = H.callHackage "microspec" "0.2.1.3"
-      , microstache = H.callHackage "microstache" "1.0.2.2"
+      , microstache = H.callHackage "microstache" "1.0.2.3"
       , mime-mail = H.callHackage "mime-mail" "0.5.1"
       , mime-types = H.callHackage "mime-types" "0.1.1.0"
       , mmap = H.callHackage "mmap" "0.5.9"
       , mmark = H.callHackage "mmark" "0.0.7.6"
       , mmorph = H.callHackage "mmorph" "1.2.0"
       , mockery = H.callHackage "mockery" "0.3.5"
-      , mod = H.callHackage "mod" "0.1.2.2"
+      , mod = H.callHackage "mod" "0.2.0.1"
       , modern-uri = H.callHackage "modern-uri" "0.3.6.0"
       , monad-control = H.callHackage "monad-control" "1.0.3.1"
-      , monad-logger = H.callHackage "monad-logger" "0.3.37"
+      , monad-logger = H.callHackage "monad-logger" "0.3.39"
       , monad-logger-extras = H.callHackage "monad-logger-extras" "0.1.1.1"
       , monad-loops = H.callHackage "monad-loops" "0.4.3"
       , monad-par = H.callHackage "monad-par" "0.3.5"
@@ -771,12 +774,7 @@ let packages =
       , monads-tf = H.callHackage "monads-tf" "0.1.0.3"
       , mono-traversable = H.callHackage "mono-traversable" "1.0.15.3"
       , monoid-extras = H.callHackage "monoid-extras" "0.6.2"
-      , monoid-subclasses = H.callHackage "monoid-subclasses" "1.1.3"
-      , monoidal-containers =
-          H.callGit
-            "https://github.com/locallycompact/monoidal-containers"
-            "977140aed7f850ca4e73090475b0f7ff02a7a92e"
-            (None H.Subdir)
+      , monoid-subclasses = H.callHackage "monoid-subclasses" "1.2.2"
       , mtl-compat = H.callHackage "mtl-compat" "0.2.2"
       , mtl-prelude = H.callHackage "mtl-prelude" "2.0.3.1"
       , multiset = H.callHackage "multiset" "0.3.4.3"
@@ -787,19 +785,19 @@ let packages =
       , natural-arithmetic = H.callHackage "natural-arithmetic" "0.1.3.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.2"
-      , network = H.callHackage "network" "3.1.2.7"
+      , net-mqtt = H.callHackage "net-mqtt" "0.8.2.5"
+      , network = H.callHackage "network" "3.1.2.8"
       , network-bsd = H.callHackage "network-bsd" "2.8.1.0"
       , network-byte-order = H.callHackage "network-byte-order" "0.1.6"
       , network-conduit-tls = H.callHackage "network-conduit-tls" "1.3.2"
       , network-info = H.callHackage "network-info" "0.2.1"
       , network-run = H.callHackage "network-run" "0.2.4"
-      , network-uri = H.callHackage "network-uri" "2.6.4.1"
+      , network-uri = H.callHackage "network-uri" "2.6.4.2"
       , 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.1.0"
+      , nonempty-vector = H.callHackage "nonempty-vector" "0.2.2.0"
       , nothunks = H.callHackage "nothunks" "0.1.3"
       , numeric-extras = H.callHackage "numeric-extras" "0.1"
       , numeric-prelude = H.callHackage "numeric-prelude" "0.4.4"
@@ -812,7 +810,7 @@ let packages =
       , old-locale = H.callHackage "old-locale" "1.0.0.7"
       , old-time = H.callHackage "old-time" "1.1.0.3"
       , one-liner = H.callHackage "one-liner" "2.1"
-      , openapi3 = H.callHackage "openapi3" "3.2.2"
+      , openapi3 = H.callHackage "openapi3" "3.2.3"
       , 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"
@@ -823,14 +821,15 @@ let packages =
       , optional-args = H.callHackage "optional-args" "1.0.2"
       , options = H.callHackage "options" "1.2.1.1"
       , optparse-applicative = H.callHackage "optparse-applicative" "0.17.0.0"
-      , optparse-generic = H.callHackage "optparse-generic" "1.4.8"
+      , optparse-generic = H.callHackage "optparse-generic" "1.4.9"
       , optparse-simple = H.callHackage "optparse-simple" "0.1.1.4"
       , ordered-containers = H.callHackage "ordered-containers" "0.2.3"
-      , pandoc = H.callHackage "pandoc" "2.19.2"
-      , pandoc-lua-marshal = H.callHackage "pandoc-lua-marshal" "0.1.7"
-      , pandoc-types = H.callHackage "pandoc-types" "1.22.2.1"
+      , pager = H.callHackage "pager" "0.1.1.0"
+      , pandoc = H.callHackage "pandoc" "3.1.1"
+      , pandoc-lua-marshal = H.callHackage "pandoc-lua-marshal" "0.2.2"
+      , pandoc-types = H.callHackage "pandoc-types" "1.23"
       , parallel = H.callHackage "parallel" "3.2.2.0"
-      , parsec = H.callHackage "parsec" "3.1.15.1"
+      , parsec = H.callHackage "parsec" "3.1.16.1"
       , parsec-class = H.callHackage "parsec-class" "1.0.0.0"
       , parsec-numbers = H.callHackage "parsec-numbers" "0.1.0"
       , parsec1 = H.callHackage "parsec1" "1.0.0.8"
@@ -838,11 +837,11 @@ let packages =
       , parsers = H.callHackage "parsers" "0.12.11"
       , parsers-megaparsec = H.callHackage "parsers-megaparsec" "0.1.0.1"
       , partial-order = H.callHackage "partial-order" "0.2.0.0"
-      , password = H.callHackage "password" "3.0.2.0"
+      , password = H.callHackage "password" "3.0.2.1"
       , password-types = H.callHackage "password-types" "1.0.0.0"
       , path = H.callHackage "path" "0.9.2"
       , path-dhall-instance = H.callHackage "path-dhall-instance" "0.2.1.0"
-      , path-io = H.callHackage "path-io" "1.7.0"
+      , path-io = H.callHackage "path-io" "1.8.0"
       , path-pieces = H.callHackage "path-pieces" "0.2.1"
       , patience = H.callHackage "patience" "0.3"
       , pcg-random = H.callHackage "pcg-random" "0.1.3.7"
@@ -850,13 +849,13 @@ let packages =
       , pcre-light = H.callHackage "pcre-light" "0.4.1.0"
       , pcre2 = H.callHackage "pcre2" "2.2.1"
       , pem = H.callHackage "pem" "0.2.4"
-      , persistent = H.callHackage "persistent" "2.14.3.0"
-      , persistent-postgresql = H.callHackage "persistent-postgresql" "2.13.5.0"
+      , 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.0"
+      , persistent-sqlite = H.callHackage "persistent-sqlite" "2.13.1.1"
       , 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.2.0"
+      , pg-entity = H.callHackage "pg-entity" "0.0.4.2"
       , pg-transact = H.callHackage "pg-transact" "0.3.2.0"
       , pg-transact-effectful =
           H.callGit
@@ -868,10 +867,10 @@ let packages =
       , pipes-safe = H.callHackage "pipes-safe" "2.3.4"
       , pointed = H.callHackage "pointed" "5.0.4"
       , polyparse = H.callHackage "polyparse" "1.13"
-      , polysemy = H.callHackage "polysemy" "1.7.1.0"
+      , polysemy = H.callHackage "polysemy" "1.9.0.0"
       , 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.1.0"
+      , polysemy-methodology = H.callHackage "polysemy-methodology" "0.2.2.0"
       , polysemy-path = H.callHackage "polysemy-path" "0.2.1.0"
       , polysemy-plugin =
           H.callGit
@@ -879,29 +878,29 @@ let packages =
             "bd944ca000c1ca69602d4723e3859af431b9d0c4"
             (Some "polysemy-plugin/")
       , polysemy-several = H.callHackage "polysemy-several" "0.1.1.0"
-      , polysemy-test = H.callHackage "polysemy-test" "0.6.0.0"
-      , polysemy-time = H.callHackage "polysemy-time" "0.5.1.0"
+      , polysemy-test = H.callHackage "polysemy-test" "0.7.0.0"
+      , polysemy-time = H.callHackage "polysemy-time" "0.6.0.0"
       , polysemy-vinyl = H.callHackage "polysemy-vinyl" "0.1.5.0"
-      , polysemy-zoo = H.callHackage "polysemy-zoo" "0.8.0.0"
+      , polysemy-zoo = H.callHackage "polysemy-zoo" "0.8.1.0"
       , port-utils = H.callHackage "port-utils" "0.2.1.0"
       , postgres-options = H.callHackage "postgres-options" "0.2.0.0"
-      , postgresql-libpq = H.callHackage "postgresql-libpq" "0.9.4.3"
-      , postgresql-migration = H.callHackage "postgresql-migration" "0.2.1.4"
-      , postgresql-simple = H.callHackage "postgresql-simple" "0.6.4"
+      , 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"
       , postgresql-simple-migration =
           H.callHackage "postgresql-simple-migration" "0.1.15.0"
       , pqueue = H.callHackage "pqueue" "1.4.3.0"
       , pretty-hex = H.callHackage "pretty-hex" "1.1"
       , pretty-relative-time = H.callHackage "pretty-relative-time" "0.3.0.0"
       , pretty-show = H.callHackage "pretty-show" "1.10"
-      , pretty-simple = H.callHackage "pretty-simple" "4.1.1.0"
+      , pretty-simple = H.callHackage "pretty-simple" "4.1.2.0"
       , prettyprinter = H.callHackage "prettyprinter" "1.7.1"
       , prettyprinter-ansi-terminal =
           H.callHackage "prettyprinter-ansi-terminal" "1.1.3"
       , primes = H.callHackage "primes" "0.2.1.0"
       , primitive = H.callHackage "primitive" "0.7.4.0"
       , primitive-addr = H.callHackage "primitive-addr" "0.1.0.2"
-      , primitive-extras = H.callHackage "primitive-extras" "0.10.1.5"
+      , primitive-extras = H.callHackage "primitive-extras" "0.10.1.6"
       , primitive-offset = H.callHackage "primitive-offset" "0.2.0.0"
       , primitive-unlifted = H.callHackage "primitive-unlifted" "0.1.3.1"
       , process-extras = H.callHackage "process-extras" "0.7.4"
@@ -911,8 +910,8 @@ let packages =
       , prometheus-metrics-ghc =
           H.callHackage "prometheus-metrics-ghc" "1.0.1.2"
       , prometheus-proc = H.callHackage "prometheus-proc" "0.1.4.0"
-      , proteaaudio-sdl = H.callHackage "proteaaudio-sdl" "0.9.2"
-      , protolude = H.callHackage "protolude" "0.3.2"
+      , proteaaudio-sdl = H.callHackage "proteaaudio-sdl" "0.9.3"
+      , protolude = H.callHackage "protolude" "0.3.3"
       , psqueues = H.callHackage "psqueues" "0.2.7.3"
       , pureMD5 = H.callHackage "pureMD5" "2.1.4"
       , quickcheck-arbitrary-adt =
@@ -921,13 +920,12 @@ let packages =
       , quickcheck-classes = H.callHackage "quickcheck-classes" "0.6.5.0"
       , quickcheck-classes-base =
           H.callHackage "quickcheck-classes-base" "0.6.2.0"
-      , quickcheck-dynamic = H.callHackage "quickcheck-dynamic" "2.0.0"
-      , quickcheck-instances = H.callHackage "quickcheck-instances" "0.3.28"
+      , quickcheck-instances = H.callHackage "quickcheck-instances" "0.3.29.1"
       , quickcheck-io = H.callHackage "quickcheck-io" "0.2.0"
       , quickcheck-text = H.callHackage "quickcheck-text" "0.1.2.1"
       , quickcheck-unicode = H.callHackage "quickcheck-unicode" "1.0.1.0"
       , quiet = H.callHackage "quiet" "0.2"
-      , ral = H.callHackage "ral" "0.1"
+      , ral = H.callHackage "ral" "0.2.1"
       , random = H.callHackage "random" "1.2.1.1"
       , random-bytestring = H.callHackage "random-bytestring" "0.1.4"
       , random-fu = H.callHackage "random-fu" "0.3.0.0"
@@ -936,26 +934,27 @@ let packages =
       , raw-strings-qq = H.callHackage "raw-strings-qq" "1.1"
       , rdtsc = H.callHackage "rdtsc" "1.3.0.1"
       , readable = H.callHackage "readable" "0.3.1"
-      , rebase = H.callHackage "rebase" "1.16"
-      , recursion-schemes = H.callHackage "recursion-schemes" "5.2.2.2"
+      , rebase = H.callHackage "rebase" "1.20"
+      , recursion-schemes = H.callHackage "recursion-schemes" "5.2.2.4"
+      , recv = H.callHackage "recv" "0.1.0"
       , reducers = H.callHackage "reducers" "3.12.4"
       , ref-tf = H.callHackage "ref-tf" "0.5.0.1"
       , refact = H.callHackage "refact" "0.3.0.2"
       , refined = H.callHackage "refined" "0.8"
-      , reflection = H.callHackage "reflection" "2.1.6"
+      , reflection = H.callHackage "reflection" "2.1.7"
       , regex-applicative = H.callHackage "regex-applicative" "0.3.4"
       , regex-base = H.callHackage "regex-base" "0.94.0.2"
       , regex-compat = H.callHackage "regex-compat" "0.95.2.1"
       , regex-pcre-builtin = H.callHackage "regex-pcre-builtin" "0.95.2.3.8.44"
       , regex-posix = H.callHackage "regex-posix" "0.96.0.1"
       , regex-tdfa = H.callHackage "regex-tdfa" "1.3.2"
-      , relude = H.callHackage "relude" "1.1.0.0"
+      , relude = H.callHackage "relude" "1.2.0.0"
       , replace-megaparsec = H.callHackage "replace-megaparsec" "1.4.5.0"
       , repline = H.callHackage "repline" "0.4.2.0"
       , rere = H.callHackage "rere" "0.2"
-      , rerebase = H.callHackage "rerebase" "1.15.0.3"
+      , rerebase = H.callHackage "rerebase" "1.20"
       , resolv = H.callHackage "resolv" "0.1.2.0"
-      , resource-pool = H.callHackage "resource-pool" "0.3.1.0"
+      , resource-pool = H.callHackage "resource-pool" "0.4.0.0"
       , resourcet = H.callHackage "resourcet" "1.3.0"
       , retrie = H.callHackage "retrie" "1.2.1.1"
       , retry = H.callHackage "retry" "0.9.3.0"
@@ -969,18 +968,18 @@ let packages =
       , safe-coloured-text-terminfo =
           H.callHackage "safe-coloured-text-terminfo" "0.1.0.0"
       , safe-exceptions = H.callHackage "safe-exceptions" "0.1.7.3"
-      , saltine = H.callHackage "saltine" "0.2.0.1"
-      , sandwich = H.callHackage "sandwich" "0.1.1.2"
+      , saltine = H.callHackage "saltine" "0.2.1.0"
+      , sandwich = H.callHackage "sandwich" "0.1.3.0"
       , say = H.callHackage "say" "0.1.0.1"
       , scientific = H.callHackage "scientific" "0.3.7.0"
-      , scotty = H.callHackage "scotty" "0.12"
-      , sdl2 = H.callHackage "sdl2" "2.5.3.3"
+      , scotty = H.callHackage "scotty" "0.12.1"
+      , sdl2 = H.callHackage "sdl2" "2.5.4.0"
       , sdl2-gfx = H.callHackage "sdl2-gfx" "0.3.0.0"
       , sdl2-image = H.callHackage "sdl2-image" "2.1.0.0"
       , sdl2-mixer = H.callHackage "sdl2-mixer" "1.2.0.0"
       , sdl2-ttf = H.callHackage "sdl2-ttf" "2.1.3"
-      , selective = H.callHackage "selective" "0.5"
-      , semialign = H.callHackage "semialign" "1.2.0.1"
+      , selective = H.callHackage "selective" "0.7"
+      , semialign = H.callHackage "semialign" "1.3"
       , semigroupoids = H.callHackage "semigroupoids" "5.3.7"
       , semigroups = H.callHackage "semigroups" "0.20"
       , semirings = H.callHackage "semirings" "0.6"
@@ -1016,11 +1015,10 @@ let packages =
             "https://github.com/TeofilC/servant"
             "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
             (Some "servant-foreign/")
-      , servant-lucid = H.callHackage "servant-lucid" "0.9.0.5"
+      , 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.5"
-      , servant-polysemy = H.callHackage "servant-polysemy" "0.1.3"
+      , servant-openapi3 = H.callHackage "servant-openapi3" "2.0.1.6"
       , servant-server =
           H.callGit
             "https://github.com/TeofilC/servant"
@@ -1034,11 +1032,11 @@ let packages =
       , servant-websockets = H.callHackage "servant-websockets" "2.0.0"
       , setenv = H.callHackage "setenv" "0.1.1.3"
       , setlocale = H.callHackage "setlocale" "1.0.0.10"
-      , shake = H.callHackage "shake" "0.19.6"
+      , shake = H.callHackage "shake" "0.19.7"
       , shake-bench = H.callHackage "shake-bench" "0.2.0.0"
       , shakespeare = H.callHackage "shakespeare" "2.0.30"
-      , shelly = H.callHackage "shelly" "1.10.0"
-      , shh = H.callHackage "shh" "0.7.2.0"
+      , shelly = H.callHackage "shelly" "1.12.0"
+      , shh = H.callHackage "shh" "0.7.2.1"
       , should-not-typecheck = H.callHackage "should-not-typecheck" "2.1.0"
       , show-combinators = H.callHackage "show-combinators" "0.2.0.0"
       , silently = H.callHackage "silently" "1.2.5.3"
@@ -1046,58 +1044,60 @@ let packages =
       , simple-sendfile = H.callHackage "simple-sendfile" "0.2.30"
       , singleton-bool = H.callHackage "singleton-bool" "0.1.6"
       , singletons = H.callHackage "singletons" "3.0.2"
-      , singletons-th = H.callHackage "singletons-th" "3.1.1"
       , size-based = H.callHackage "size-based" "0.1.3.1"
-      , skylighting = H.callHackage "skylighting" "0.13.1.1"
-      , skylighting-core = H.callHackage "skylighting-core" "0.13.1.1"
+      , skylighting = H.callHackage "skylighting" "0.13.2.1"
+      , skylighting-core = H.callHackage "skylighting-core" "0.13.2.1"
       , skylighting-format-ansi = H.callHackage "skylighting-format-ansi" "0.1"
       , skylighting-format-blaze-html =
-          H.callHackage "skylighting-format-blaze-html" "0.1"
+          H.callHackage "skylighting-format-blaze-html" "0.1.1"
+      , skylighting-format-context =
+          H.callHackage "skylighting-format-context" "0.1.0.2"
       , skylighting-format-latex =
           H.callHackage "skylighting-format-latex" "0.1"
       , slugify = H.callHackage "slugify" "0.1.0.1"
       , smallcheck = H.callHackage "smallcheck" "1.2.1"
-      , snap-core = H.callHackage "snap-core" "1.0.5.0"
-      , snap-server = H.callHackage "snap-server" "1.1.2.0"
+      , snap-core = H.callHackage "snap-core" "1.0.5.1"
+      , snap-server = H.callHackage "snap-server" "1.1.2.1"
       , socks = H.callHackage "socks" "0.6.1"
-      , some = H.callHackage "some" "1.0.4"
-      , sop-core = H.callHackage "sop-core" "0.5.0.1"
+      , some = H.callHackage "some" "1.0.5"
+      , 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"
-      , souffle-haskell = H.callHackage "souffle-haskell" "3.5.0"
+      , souffle-haskell = H.callHackage "souffle-haskell" "3.5.1"
       , special-values = H.callHackage "special-values" "0.1.0.0"
-      , split = H.callHackage "split" "0.2.3.3"
+      , split = H.callHackage "split" "0.2.3.5"
       , splitmix = H.callHackage "splitmix" "0.1.0.4"
       , spoon = H.callHackage "spoon" "0.3.1"
       , sqlite-simple = H.callHackage "sqlite-simple" "0.4.18.2"
-      , statestack = H.callHackage "statestack" "0.3.1"
-      , statistics = H.callHackage "statistics" "0.16.1.0"
+      , statestack = H.callHackage "statestack" "0.3.1.1"
+      , statistics = H.callHackage "statistics" "0.16.1.2"
       , statistics-linreg = H.callHackage "statistics-linreg" "0.3"
       , stm-chans = H.callHackage "stm-chans" "3.0.0.6"
-      , stm-containers = H.callHackage "stm-containers" "1.2"
-      , stm-hamt = H.callHackage "stm-hamt" "1.2.0.8"
-      , storable-record = H.callHackage "storable-record" "0.0.6"
-      , storable-tuple = H.callHackage "storable-tuple" "0.0.3.3"
+      , stm-containers = H.callHackage "stm-containers" "1.2.0.2"
+      , stm-hamt = H.callHackage "stm-hamt" "1.2.0.9"
+      , storable-record = H.callHackage "storable-record" "0.0.7"
+      , storable-tuple = H.callHackage "storable-tuple" "0.1"
       , store = H.callHackage "store" "0.7.16"
       , store-core = H.callHackage "store-core" "0.4.4.4"
       , streaming = H.callHackage "streaming" "0.2.3.1"
       , streaming-binary = H.callHackage "streaming-binary" "0.3.0.1"
       , streaming-bytestring = H.callHackage "streaming-bytestring" "0.2.4"
-      , streaming-commons = H.callHackage "streaming-commons" "0.2.2.4"
-      , streamly = H.callHackage "streamly" "0.8.3"
-      , strict = H.callHackage "strict" "0.4.0.1"
+      , streaming-commons = H.callHackage "streaming-commons" "0.2.2.5"
+      , streamly = H.callHackage "streamly" "0.9.0"
+      , streamly-core = H.callHackage "streamly-core" "0.1.0"
+      , strict = H.callHackage "strict" "0.5"
       , strict-list = H.callHackage "strict-list" "0.1.7"
       , 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.1.2"
+      , string-interpolate = H.callHackage "string-interpolate" "0.3.2.0"
       , string-qq = H.callHackage "string-qq" "0.0.4"
       , stringbuilder = H.callHackage "stringbuilder" "0.5.1"
       , stringsearch = H.callHackage "stringsearch" "0.3.6.6"
       , sundown = H.callHackage "sundown" "0.6"
       , svg-builder = H.callHackage "svg-builder" "0.1.1"
-      , swagger2 = H.callHackage "swagger2" "2.8.5"
-      , syb = H.callHackage "syb" "0.7.2.1"
-      , sydtest = H.callHackage "sydtest" "0.13.0.0"
+      , swagger2 = H.callHackage "swagger2" "2.8.6"
+      , syb = H.callHackage "syb" "0.7.2.3"
+      , sydtest = H.callHackage "sydtest" "0.13.0.1"
       , sydtest-discover = H.callHackage "sydtest-discover" "0.0.0.2"
       , system-fileio = H.callHackage "system-fileio" "0.3.16.4"
       , system-filepath = H.callHackage "system-filepath" "0.4.14"
@@ -1110,13 +1110,13 @@ let packages =
             "107c0b78524acfd0e77e767b83073492008bea0c"
             (None H.Subdir)
       , tasty = H.callHackage "tasty" "1.4.3"
-      , tasty-bench = H.callHackage "tasty-bench" "0.3.2"
+      , tasty-bench = H.callHackage "tasty-bench" "0.3.3"
       , tasty-discover = H.callHackage "tasty-discover" "5.0.0"
       , tasty-expected-failure = H.callHackage "tasty-expected-failure" "0.12.3"
       , tasty-golden = H.callHackage "tasty-golden" "2.3.5"
-      , tasty-hedgehog = H.callHackage "tasty-hedgehog" "1.4.0.0"
-      , tasty-hslua = H.callHackage "tasty-hslua" "1.0.2"
-      , tasty-hspec = H.callHackage "tasty-hspec" "1.2.0.1"
+      , tasty-hedgehog = H.callHackage "tasty-hedgehog" "1.4.0.1"
+      , tasty-hslua = H.callHackage "tasty-hslua" "1.1.0"
+      , tasty-hspec = H.callHackage "tasty-hspec" "1.2.0.3"
       , tasty-hunit =
           H.callGit
             "https://github.com/UnkindPartition/tasty"
@@ -1125,7 +1125,7 @@ let packages =
       , tasty-inspection-testing =
           H.callHackage "tasty-inspection-testing" "0.2"
       , tasty-kat = H.callHackage "tasty-kat" "0.0.3"
-      , tasty-lua = H.callHackage "tasty-lua" "1.0.2"
+      , tasty-lua = H.callHackage "tasty-lua" "1.1.0"
       , tasty-quickcheck = H.callHackage "tasty-quickcheck" "0.10.2"
       , tasty-rerun = H.callHackage "tasty-rerun" "1.1.18"
       , tasty-silver = H.callHackage "tasty-silver" "3.3.1.1"
@@ -1134,7 +1134,7 @@ let packages =
       , tasty-wai = H.callHackage "tasty-wai" "0.1.2.0"
       , tdigest = H.callHackage "tdigest" "0.2.1.1"
       , temporary = H.callHackage "temporary" "1.3"
-      , terminal-size = H.callHackage "terminal-size" "0.3.3"
+      , terminal-size = H.callHackage "terminal-size" "0.3.4"
       , test-framework = H.callHackage "test-framework" "0.8.2.0"
       , test-framework-hunit = H.callHackage "test-framework-hunit" "0.3.0.2"
       , test-framework-quickcheck2 =
@@ -1145,7 +1145,10 @@ let packages =
       , 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.5.4"
+      , texmath = H.callHackage "texmath" "0.12.6"
+      , text-ansi = H.callHackage "text-ansi" "0.2.1"
+      , text-builder = H.callHackage "text-builder" "0.6.7"
+      , text-builder-dev = H.callHackage "text-builder-dev" "0.3.3.2"
       , text-conversions = H.callHackage "text-conversions" "0.3.1.1"
       , text-display = H.callHackage "text-display" "0.0.3.0"
       , text-icu = H.callHackage "text-icu" "0.8.0.2"
@@ -1153,15 +1156,15 @@ let packages =
       , text-metrics = H.callHackage "text-metrics" "0.3.2"
       , text-rope = H.callHackage "text-rope" "0.2"
       , text-short = H.callHackage "text-short" "0.1.5"
-      , text-zipper = H.callHackage "text-zipper" "0.12"
+      , text-zipper = H.callHackage "text-zipper" "0.13"
       , tf-random = H.callHackage "tf-random" "0.5"
-      , th-abstraction = H.callHackage "th-abstraction" "0.4.5.0"
+      , th-abstraction = H.callHackage "th-abstraction" "0.5.0.0"
       , th-compat = H.callHackage "th-compat" "0.1.4"
-      , th-desugar = H.callHackage "th-desugar" "1.14"
+      , th-desugar = H.callHackage "th-desugar" "1.15"
       , th-env = H.callHackage "th-env" "0.1.1"
-      , th-expand-syns = H.callHackage "th-expand-syns" "0.4.10.0"
+      , th-expand-syns = H.callHackage "th-expand-syns" "0.4.11.0"
       , th-extras = H.callHackage "th-extras" "0.0.0.6"
-      , th-lift = H.callHackage "th-lift" "0.8.2"
+      , th-lift = H.callHackage "th-lift" "0.8.3"
       , th-lift-instances = H.callHackage "th-lift-instances" "0.1.20"
       , th-orphans = H.callHackage "th-orphans" "0.13.14"
       , th-reify-many = H.callHackage "th-reify-many" "0.1.10"
@@ -1169,7 +1172,8 @@ let packages =
       , these = H.callHackage "these" "1.2"
       , these-skinny = H.callHackage "these-skinny" "0.7.5"
       , threads = H.callHackage "threads" "0.5.1.7"
-      , tidal = H.callHackage "tidal" "1.8.1"
+      , tidal = H.callHackage "tidal" "1.9.4"
+      , tidal-link = H.callHackage "tidal-link" "1.0.1"
       , time-compat = H.callHackage "time-compat" "1.9.6.1"
       , time-effectful =
           H.callGit
@@ -1187,36 +1191,32 @@ let packages =
       , torsor = H.callHackage "torsor" "0.1"
       , transformers-base = H.callHackage "transformers-base" "0.4.6"
       , transformers-compat = H.callHackage "transformers-compat" "0.7.2"
-      , transformers-except = H.callHackage "transformers-except" "0.1.2"
+      , transformers-except = H.callHackage "transformers-except" "0.1.3"
       , tree-diff = H.callHackage "tree-diff" "0.2.2"
       , trifecta = H.callHackage "trifecta" "2.1.2"
       , tuple = H.callHackage "tuple" "0.3.0.2"
       , turtle = H.callHackage "turtle" "1.6.1"
       , type-equality = H.callHackage "type-equality" "1"
-      , type-errors = H.callHackage "type-errors" "0.2.0.0"
+      , type-errors = H.callHackage "type-errors" "0.2.0.1"
       , type-errors-pretty = H.callHackage "type-errors-pretty" "0.0.1.2"
-      , typed-process = H.callHackage "typed-process" "0.2.10.1"
+      , typed-process = H.callHackage "typed-process" "0.2.11.0"
       , typerep-map = H.callHackage "typerep-map" "0.6.0.0"
       , uglymemo = H.callHackage "uglymemo" "0.1.0.1"
       , unagi-chan = H.callHackage "unagi-chan" "0.4.1.4"
       , unbounded-delays = H.callHackage "unbounded-delays" "0.1.1.1"
-      , unicode-collation = H.callHackage "unicode-collation" "0.1.3.2"
-      , unicode-data = H.callHackage "unicode-data" "0.3.1"
+      , unicode-collation = H.callHackage "unicode-collation" "0.1.3.4"
+      , unicode-data = H.callHackage "unicode-data" "0.4.0.1"
       , unicode-transforms = H.callHackage "unicode-transforms" "0.4.0.1"
       , uniplate = H.callHackage "uniplate" "1.6.13"
-      , universe-base = H.callHackage "universe-base" "1.1.3"
+      , universe-base = H.callHackage "universe-base" "1.1.3.1"
       , universe-reverse-instances =
           H.callHackage "universe-reverse-instances" "1.1.1"
       , unix-bytestring = H.callHackage "unix-bytestring" "0.3.7.8"
-      , unix-compat =
-          H.callGit
-            "https://github.com/mitchellwrosen/fork--unix-compat"
-            "f28060acd449643d267954647c1bb7c748c35fa9"
-            (None H.Subdir)
+      , unix-compat = H.callHackage "unix-compat" "0.7"
       , unix-memory = H.callHackage "unix-memory" "0.1.2"
-      , unix-time = H.callHackage "unix-time" "0.4.8"
-      , unliftio = H.callHackage "unliftio" "0.2.23.0"
-      , unliftio-core = H.callHackage "unliftio-core" "0.2.0.1"
+      , unix-time = H.callHackage "unix-time" "0.4.9"
+      , unliftio = H.callHackage "unliftio" "0.2.24.0"
+      , unliftio-core = H.callHackage "unliftio-core" "0.2.1.0"
       , unordered-containers = H.callHackage "unordered-containers" "0.2.19.1"
       , uri-bytestring = H.callHackage "uri-bytestring" "0.3.3.1"
       , uri-encode = H.callHackage "uri-encode" "1.5.0.7"
@@ -1226,7 +1226,7 @@ let packages =
       , uuid = H.callHackage "uuid" "1.3.15"
       , uuid-types = H.callHackage "uuid-types" "1.0.5"
       , validation = H.callHackage "validation" "1.1.2"
-      , validation-selective = H.callHackage "validation-selective" "0.1.0.2"
+      , validation-selective = H.callHackage "validation-selective" "0.2.0.0"
       , validity = H.callHackage "validity" "0.12.0.1"
       , validity-aeson = H.callHackage "validity-aeson" "0.2.0.5"
       , validity-bytestring = H.callHackage "validity-bytestring" "0.4.1.1"
@@ -1256,7 +1256,7 @@ let packages =
       , vector-th-unbox = H.callHackage "vector-th-unbox" "0.2.2"
       , vinyl = H.callHackage "vinyl" "0.14.3"
       , void = H.callHackage "void" "0.7.3"
-      , vty = H.callHackage "vty" "5.37"
+      , vty = H.callHackage "vty" "5.38"
       , wai = H.callHackage "wai" "3.2.3"
       , wai-app-static = H.callHackage "wai-app-static" "3.1.7.4"
       , wai-conduit = H.callHackage "wai-conduit" "3.0.0.4"
@@ -1272,11 +1272,11 @@ 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.22"
-      , warp-tls = H.callHackage "warp-tls" "3.3.3"
+      , warp = H.callHackage "warp" "3.3.25"
+      , warp-tls = H.callHackage "warp-tls" "3.3.5"
       , websockets = H.callHackage "websockets" "0.12.7.3"
       , weigh = H.callHackage "weigh" "0.0.16"
-      , wide-word = H.callHackage "wide-word" "0.1.3.0"
+      , wide-word = H.callHackage "wide-word" "0.1.5.0"
       , with-utf8 = H.callHackage "with-utf8" "1.0.2.3"
       , witherable = H.callHackage "witherable" "0.4.2"
       , wizards = H.callHackage "wizards" "1.0.3"
@@ -1284,8 +1284,8 @@ let packages =
       , word-compat = H.callHackage "word-compat" "0.0.6"
       , word-wrap = H.callHackage "word-wrap" "0.5"
       , word8 = H.callHackage "word8" "0.1.3"
-      , wreq = H.callHackage "wreq" "0.5.3.3"
-      , wuss = H.callHackage "wuss" "2.0.0.2"
+      , wreq = H.callHackage "wreq" "0.5.4.0"
+      , wuss = H.callHackage "wuss" "2.0.1.3"
       , x509 = H.callHackage "x509" "1.7.7"
       , x509-store = H.callHackage "x509-store" "1.6.9"
       , x509-system = H.callHackage "x509-system" "1.6.7"
@@ -1298,8 +1298,8 @@ let packages =
       , xmonad = H.callHackage "xmonad" "0.17.1"
       , xmonad-contrib = H.callHackage "xmonad-contrib" "0.17.1"
       , xss-sanitize = H.callHackage "xss-sanitize" "0.3.7.1"
-      , yaml = H.callHackage "yaml" "0.11.8.0"
-      , zip-archive = H.callHackage "zip-archive" "0.4.2.2"
+      , yaml = H.callHackage "yaml" "0.11.11.0"
+      , zip-archive = H.callHackage "zip-archive" "0.4.3"
       , zlib = H.callHackage "zlib" "0.6.3.0"
       , zlib-bindings = H.callHackage "zlib-bindings" "0.1.1.5"
       }
diff --git a/initial-packages.nix b/initial-packages.nix
index f3e2819ea9c25571f4fb213874e0c158295f0d32..89562676a58de06664cb3e8583e98261c027757f 100644
--- a/initial-packages.nix
+++ b/initial-packages.nix
@@ -293,6 +293,8 @@ self: with pkgs.haskell.lib; {
 
   commonmark-pandoc = self.callPackage (./pkgs/commonmark-pandoc.nix) { };
 
+  commutative-semigroups = self.callPackage (./pkgs/commutative-semigroups.nix) { };
+
   comonad = self.callPackage (./pkgs/comonad.nix) { };
 
   compact = self.callPackage (./pkgs/compact.nix) { };
@@ -741,8 +743,6 @@ self: with pkgs.haskell.lib; {
 
   haddock-library = self.callPackage (./pkgs/haddock-library.nix) { };
 
-  hakyll = self.callPackage (./pkgs/hakyll.nix) { };
-
   half = self.callPackage (./pkgs/half.nix) { };
 
   happy = self.callPackage (./pkgs/happy.nix) { };
@@ -881,6 +881,8 @@ self: with pkgs.haskell.lib; {
 
   hslua-core = self.callPackage (./pkgs/hslua-core.nix) { };
 
+  hslua-list = self.callPackage (./pkgs/hslua-list.nix) { };
+
   hslua-marshalling = self.callPackage (./pkgs/hslua-marshalling.nix) { };
 
   hslua-module-doclayout = self.callPackage (./pkgs/hslua-module-doclayout.nix) { };
@@ -897,6 +899,8 @@ self: with pkgs.haskell.lib; {
 
   hslua-packaging = self.callPackage (./pkgs/hslua-packaging.nix) { };
 
+  hslua-typing = self.callPackage (./pkgs/hslua-typing.nix) { };
+
   hspec = self.callPackage (./pkgs/hspec.nix) { };
 
   hspec-attoparsec = self.callPackage (./pkgs/hspec-attoparsec.nix) { };
@@ -997,8 +1001,6 @@ self: with pkgs.haskell.lib; {
 
   inline-c = self.callPackage (./pkgs/inline-c.nix) { };
 
-  inline-r = self.callPackage (./pkgs/inline-r.nix) { };
-
   insert-ordered-containers = self.callPackage (./pkgs/insert-ordered-containers.nix) { };
 
   inspection-testing = self.callPackage (./pkgs/inspection-testing.nix) { };
@@ -1025,6 +1027,8 @@ self: with pkgs.haskell.lib; {
 
   iso8601-time = self.callPackage (./pkgs/iso8601-time.nix) { };
 
+  isomorphism-class = self.callPackage (./pkgs/isomorphism-class.nix) { };
+
   iwlib = self.callPackage (./pkgs/iwlib.nix) { };
 
   jira-wiki-markup = self.callPackage (./pkgs/jira-wiki-markup.nix) { };
@@ -1223,8 +1227,6 @@ self: with pkgs.haskell.lib; {
 
   monoid-subclasses = self.callPackage (./pkgs/monoid-subclasses.nix) { };
 
-  monoidal-containers = self.callPackage (./pkgs/monoidal-containers.nix) { };
-
   mtl-compat = self.callPackage (./pkgs/mtl-compat.nix) { };
 
   mtl-prelude = self.callPackage (./pkgs/mtl-prelude.nix) { };
@@ -1315,6 +1317,8 @@ self: with pkgs.haskell.lib; {
 
   ordered-containers = self.callPackage (./pkgs/ordered-containers.nix) { };
 
+  pager = self.callPackage (./pkgs/pager.nix) { };
+
   pandoc = self.callPackage (./pkgs/pandoc.nix) { };
 
   pandoc-lua-marshal = self.callPackage (./pkgs/pandoc-lua-marshal.nix) { };
@@ -1479,8 +1483,6 @@ self: with pkgs.haskell.lib; {
 
   quickcheck-classes-base = self.callPackage (./pkgs/quickcheck-classes-base.nix) { };
 
-  quickcheck-dynamic = self.callPackage (./pkgs/quickcheck-dynamic.nix) { };
-
   quickcheck-instances = self.callPackage (./pkgs/quickcheck-instances.nix) { };
 
   quickcheck-io = self.callPackage (./pkgs/quickcheck-io.nix) { };
@@ -1513,6 +1515,8 @@ self: with pkgs.haskell.lib; {
 
   recursion-schemes = self.callPackage (./pkgs/recursion-schemes.nix) { };
 
+  recv = self.callPackage (./pkgs/recv.nix) { };
+
   reducers = self.callPackage (./pkgs/reducers.nix) { };
 
   ref-tf = self.callPackage (./pkgs/ref-tf.nix) { };
@@ -1633,8 +1637,6 @@ self: with pkgs.haskell.lib; {
 
   servant-openapi3 = self.callPackage (./pkgs/servant-openapi3.nix) { };
 
-  servant-polysemy = self.callPackage (./pkgs/servant-polysemy.nix) { };
-
   servant-server = self.callPackage (./pkgs/servant-server.nix) { };
 
   servant-static-th = self.callPackage (./pkgs/servant-static-th.nix) { };
@@ -1675,8 +1677,6 @@ self: with pkgs.haskell.lib; {
 
   singletons = self.callPackage (./pkgs/singletons.nix) { };
 
-  singletons-th = self.callPackage (./pkgs/singletons-th.nix) { };
-
   size-based = self.callPackage (./pkgs/size-based.nix) { };
 
   skylighting = self.callPackage (./pkgs/skylighting.nix) { };
@@ -1687,6 +1687,8 @@ self: with pkgs.haskell.lib; {
 
   skylighting-format-blaze-html = self.callPackage (./pkgs/skylighting-format-blaze-html.nix) { };
 
+  skylighting-format-context = self.callPackage (./pkgs/skylighting-format-context.nix) { };
+
   skylighting-format-latex = self.callPackage (./pkgs/skylighting-format-latex.nix) { };
 
   slugify = self.callPackage (./pkgs/slugify.nix) { };
@@ -1749,6 +1751,8 @@ self: with pkgs.haskell.lib; {
 
   streamly = self.callPackage (./pkgs/streamly.nix) { };
 
+  streamly-core = self.callPackage (./pkgs/streamly-core.nix) { };
+
   strict = self.callPackage (./pkgs/strict.nix) { };
 
   strict-list = self.callPackage (./pkgs/strict-list.nix) { };
@@ -1847,6 +1851,12 @@ self: with pkgs.haskell.lib; {
 
   texmath = self.callPackage (./pkgs/texmath.nix) { };
 
+  text-ansi = self.callPackage (./pkgs/text-ansi.nix) { };
+
+  text-builder = self.callPackage (./pkgs/text-builder.nix) { };
+
+  text-builder-dev = self.callPackage (./pkgs/text-builder-dev.nix) { };
+
   text-conversions = self.callPackage (./pkgs/text-conversions.nix) { };
 
   text-display = self.callPackage (./pkgs/text-display.nix) { };
@@ -1895,6 +1905,8 @@ self: with pkgs.haskell.lib; {
 
   tidal = self.callPackage (./pkgs/tidal.nix) { };
 
+  tidal-link = self.callPackage (./pkgs/tidal-link.nix) { };
+
   time-compat = self.callPackage (./pkgs/time-compat.nix) { };
 
   time-effectful = self.callPackage (./pkgs/time-effectful.nix) { };
diff --git a/pkgs/Cabal-QuickCheck.nix b/pkgs/Cabal-QuickCheck.nix
index 1820916992eaba7d8bda7df84245808c656b5c85..e644061234628ff5003f0861e123045ac5c652c0 100644
--- a/pkgs/Cabal-QuickCheck.nix
+++ b/pkgs/Cabal-QuickCheck.nix
@@ -1,19 +1,13 @@
-{ mkDerivation
-, Cabal
-, Cabal-syntax
-, QuickCheck
-, base
-, bytestring
-, fetchgit
-, lib
+{ mkDerivation, Cabal, Cabal-syntax, QuickCheck, base, bytestring
+, fetchgit, lib
 }:
 mkDerivation {
   pname = "Cabal-QuickCheck";
-  version = "3.9.0.0";
+  version = "3.10.1.0";
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "13prqza1wk1gc0az8lizrm97w6rwxv5lzvy5a4gahpr2wsliqjfg";
-    rev = "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff";
+    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
+    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/Cabal-QuickCheck/; echo source root reset to $sourceRoot";
@@ -21,11 +15,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    Cabal
-    Cabal-syntax
-    QuickCheck
+    base bytestring Cabal Cabal-syntax QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +27,4 @@ mkDerivation {
   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
index a1ea03a97bb8a024e0bf21b18b4a07f5ec843ee0..b9b56aaf2cdc7aec7e03e2925ea2a812a106465f 100644
--- a/pkgs/Cabal-described.nix
+++ b/pkgs/Cabal-described.nix
@@ -1,24 +1,14 @@
-{ mkDerivation
-, Cabal
-, Cabal-syntax
-, QuickCheck
-, base
-, containers
-, fetchgit
-, lib
-, pretty
-, rere
-, tasty
-, tasty-quickcheck
+{ mkDerivation, Cabal, Cabal-syntax, QuickCheck, base, containers
+, fetchgit, lib, pretty, rere, tasty, tasty-quickcheck
 , transformers
 }:
 mkDerivation {
   pname = "Cabal-described";
-  version = "3.9.0.0";
+  version = "3.10.1.0";
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "13prqza1wk1gc0az8lizrm97w6rwxv5lzvy5a4gahpr2wsliqjfg";
-    rev = "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff";
+    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
+    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/Cabal-described/; echo source root reset to $sourceRoot";
@@ -26,16 +16,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    Cabal
-    Cabal-syntax
-    containers
-    pretty
-    QuickCheck
-    rere
-    tasty
-    tasty-quickcheck
-    transformers
+    base Cabal Cabal-syntax containers pretty QuickCheck rere tasty
+    tasty-quickcheck transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +29,4 @@ mkDerivation {
   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
index e5dbabac277accddbb78587bd72c88c219e28277..2f03fbcdc824a06f746220d30f5e5861e56d2237 100644
--- a/pkgs/Cabal-syntax.nix
+++ b/pkgs/Cabal-syntax.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, array
-, base
-, binary
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, lib
-, mtl
-, parsec
-, pretty
-, text
-, time
-, transformers
-, unix
+{ mkDerivation, array, base, binary, bytestring, containers
+, deepseq, directory, filepath, lib, mtl, parsec, pretty, text
+, time, transformers, unix
 }:
 mkDerivation {
   pname = "Cabal-syntax";
@@ -24,21 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    binary
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    parsec
-    pretty
-    text
-    time
-    transformers
-    unix
+    array base binary bytestring containers deepseq directory filepath
+    mtl parsec pretty text time transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +24,4 @@ mkDerivation {
   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
index 33a33ae74aa414dba564afff166b28b8665d0441..49514f7ee5fc597aa5a0386fb52679b8025dfe58 100644
--- a/pkgs/Cabal-tree-diff.nix
+++ b/pkgs/Cabal-tree-diff.nix
@@ -1,18 +1,12 @@
-{ mkDerivation
-, Cabal
-, Cabal-syntax
-, base
-, fetchgit
-, lib
-, tree-diff
+{ mkDerivation, Cabal, Cabal-syntax, base, fetchgit, lib, tree-diff
 }:
 mkDerivation {
   pname = "Cabal-tree-diff";
-  version = "3.9.0.0";
+  version = "3.10.1.0";
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/packages/Cabal";
-    sha256 = "13prqza1wk1gc0az8lizrm97w6rwxv5lzvy5a4gahpr2wsliqjfg";
-    rev = "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff";
+    sha256 = "19wz3prd374yfpb37v0zj2fxsf2aqvskbkwpwhnjqszn8j3ddihi";
+    rev = "6c95f3fee3cdee859704b6476646cefd4628a850";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/Cabal-tree-diff/; echo source root reset to $sourceRoot";
@@ -30,4 +24,4 @@ mkDerivation {
   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
index b1a2005d2bb5e92f419510ec0b7a9b82b7e5eec7..1ea0f4a35a9e5f4bfcdc2975fd0818bc8dfd7add 100644
--- a/pkgs/Cabal.nix
+++ b/pkgs/Cabal.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, Cabal-syntax
-, array
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, lib
-, mtl
-, parsec
-, pretty
-, process
-, text
-, time
-, transformers
-, unix
+{ mkDerivation, Cabal-syntax, array, base, bytestring, containers
+, deepseq, directory, filepath, lib, mtl, parsec, pretty, process
+, text, time, transformers, unix
 }:
 mkDerivation {
   pname = "Cabal";
@@ -26,22 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ mtl parsec ];
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    Cabal-syntax
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    parsec
-    pretty
-    process
-    text
-    time
-    transformers
-    unix
+    array base bytestring Cabal-syntax containers deepseq directory
+    filepath mtl parsec pretty process text time transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +25,4 @@ mkDerivation {
   description = "A framework for packaging Haskell software";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HTF.nix b/pkgs/HTF.nix
index a42f4c629e7e89a1d69281d5258da167e429f049..dd1ecc282bdbce25e77633b7e88522180c08b908 100644
--- a/pkgs/HTF.nix
+++ b/pkgs/HTF.nix
@@ -1,100 +1,32 @@
-{ mkDerivation
-, Cabal
-, Diff
-, HUnit
-, QuickCheck
-, aeson
-, aeson-pretty
-, array
-, base
-, base64-bytestring
-, bytestring
-, containers
-, cpphs
-, directory
-, filepath
-, haskell-src
-, lib
-, lifted-base
-, monad-control
-, mtl
-, old-time
-, pretty
-, process
-, random
-, regex-compat
-, template-haskell
-, temporary
-, text
-, time
-, unix
-, unordered-containers
-, vector
-, xmlgen
+{ mkDerivation, Cabal, Diff, HUnit, QuickCheck, aeson, aeson-pretty
+, array, base, base64-bytestring, bytestring, containers, cpphs
+, directory, filepath, haskell-src, lib, lifted-base, monad-control
+, mtl, old-time, pretty, process, random, regex-compat
+, template-haskell, temporary, text, time, unix
+, unordered-containers, vector, xmlgen
 }:
 mkDerivation {
   pname = "HTF";
-  version = "0.15.0.0";
-  sha256 = "d812c570804f300b7c8c5c5c5c40cea4ad87ffce699988c11a17ed9073fa4b9b";
+  version = "0.15.0.1";
+  sha256 = "bc16a958bd36b03f673388470eed7fea01daaa1604677bb08dfb910598d39856";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal process ];
   libraryHaskellDepends = [
-    aeson
-    array
-    base
-    base64-bytestring
-    bytestring
-    containers
-    cpphs
-    Diff
-    directory
-    haskell-src
-    HUnit
-    lifted-base
-    monad-control
-    mtl
-    old-time
-    pretty
-    process
-    QuickCheck
-    random
-    regex-compat
-    text
-    time
-    unix
-    vector
+    aeson array base base64-bytestring bytestring containers cpphs Diff
+    directory haskell-src HUnit lifted-base monad-control mtl old-time
+    pretty process QuickCheck random regex-compat text time unix vector
     xmlgen
   ];
   libraryToolDepends = [ cpphs ];
   executableHaskellDepends = [
-    array
-    base
-    cpphs
-    directory
-    HUnit
-    mtl
-    old-time
-    random
-    text
+    array base cpphs directory HUnit mtl old-time random text
   ];
   executableToolDepends = [ cpphs ];
   testHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    directory
-    filepath
-    HUnit
-    mtl
-    process
-    random
-    regex-compat
-    template-haskell
-    temporary
-    text
+    aeson aeson-pretty base bytestring directory filepath HUnit mtl
+    process random regex-compat template-haskell temporary text
     unordered-containers
   ];
   enableLibraryProfiling = true;
@@ -108,4 +40,4 @@ mkDerivation {
   description = "The Haskell Test Framework";
   license = lib.licenses.lgpl21Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HsOpenSSL.nix b/pkgs/HsOpenSSL.nix
index b3d394cce4772619b666ab2778b88c156e5213f1..8c76f2c9856c57235b797f8c1521c0e65ec7ac82 100644
--- a/pkgs/HsOpenSSL.nix
+++ b/pkgs/HsOpenSSL.nix
@@ -1,18 +1,10 @@
-{ mkDerivation
-, Cabal
-, base
-, bytestring
-, lib
-, network
-, openssl
+{ mkDerivation, Cabal, base, bytestring, lib, network, openssl
 , time
 }:
 mkDerivation {
   pname = "HsOpenSSL";
-  version = "0.11.7.2";
-  sha256 = "8536c0939e52c990b2998a4ac5ff2b5886e1701b41b9934a87df8ec910754d7b";
-  revision = "3";
-  editedCabalFile = "0nsqxym87s48029laqba4nzwpk7nrk35x7wmpjqfnbrj82ddcshd";
+  version = "0.11.7.5";
+  sha256 = "e1f85ebe2ac9207414f2ad0b1c7c972f336e8f15ca182e42a5886909962d1478";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Partial OpenSSL binding for Haskell";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ListLike.nix b/pkgs/ListLike.nix
index 69342cbca5625a7e3f77e9285c346ca877e171da..2b682a41991dbba40ad7418c4464d062c9762c20 100644
--- a/pkgs/ListLike.nix
+++ b/pkgs/ListLike.nix
@@ -1,53 +1,21 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, array
-, base
-, bytestring
-, containers
-, deepseq
-, dlist
-, fmlist
-, lib
-, random
-, text
-, utf8-string
-, vector
+{ mkDerivation, HUnit, QuickCheck, array, base, bytestring
+, containers, deepseq, dlist, fmlist, lib, random, text
+, utf8-string, vector
 }:
 mkDerivation {
   pname = "ListLike";
-  version = "4.7.7";
-  sha256 = "0a01cd234aa4a1e97c07ce09e24e6c95f6bb423add96d387fb5bd2e1f2779e40";
-  revision = "1";
-  editedCabalFile = "155y1r051ar9k8vhb54q5ga7a5rzlm4jx1c42pbw7cfy3c8af6hc";
+  version = "4.7.8";
+  sha256 = "9a7929f29011e5647b39b8d6ef1cadf76a6ada19b747eabec5fdc077bc7437d1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    dlist
-    fmlist
-    text
-    utf8-string
-    vector
+    array base bytestring containers deepseq dlist fmlist text
+    utf8-string vector
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    dlist
-    fmlist
-    HUnit
-    QuickCheck
-    random
-    text
-    utf8-string
-    vector
+    array base bytestring containers dlist fmlist HUnit QuickCheck
+    random text utf8-string vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +28,4 @@ mkDerivation {
   description = "Generalized support for list-like structures";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/MonadRandom.nix b/pkgs/MonadRandom.nix
index 799b9d8c755ef9485a96c90ba6b7ee248d512a37..4a4b52227addda61dcd56ffb7fd944a3ede54aa8 100644
--- a/pkgs/MonadRandom.nix
+++ b/pkgs/MonadRandom.nix
@@ -1,28 +1,17 @@
-{ mkDerivation
-, base
-, lib
-, mtl
-, primitive
-, random
-, transformers
+{ mkDerivation, base, lib, mtl, primitive, random, transformers
 , transformers-compat
 }:
 mkDerivation {
   pname = "MonadRandom";
-  version = "0.5.3";
-  sha256 = "27184dadda0a49abac0208a1e6576b14217a60dc45b6839cd9e90af25ee00a9f";
-  revision = "2";
-  editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr";
+  version = "0.6";
+  sha256 = "c9388630895c3e68035ab804004de852b63a95d083aa140dc0e1481c854ed044";
+  revision = "3";
+  editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    mtl
-    primitive
-    random
-    transformers
-    transformers-compat
+    base mtl primitive random transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   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
index c9b0c88e277b7148794b735dc466e3ea9b74e632..626fc7d7d18af7af0d1ec0e1f6eff73c10d28529 100644
--- a/pkgs/OneTuple.nix
+++ b/pkgs/OneTuple.nix
@@ -1,15 +1,17 @@
-{ mkDerivation, base, ghc-prim, hashable, lib, template-haskell }:
+{ mkDerivation, base, foldable1-classes-compat, ghc-prim, hashable
+, lib, template-haskell
+}:
 mkDerivation {
   pname = "OneTuple";
-  version = "0.3.1";
-  sha256 = "98853682d52fb4cc37a45cd186fbd77cf2565d3df5171acc4cf026427e103eef";
-  revision = "3";
-  editedCabalFile = "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw";
+  version = "0.4.1.1";
+  sha256 = "c9e764d4ee1e57cad8341bd5d0de33ba3a52b6793fc1309679f2bf60c030bb2b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ghc-prim template-haskell ];
-  testHaskellDepends = [ base hashable template-haskell ];
+  testHaskellDepends = [
+    base foldable1-classes-compat hashable template-haskell
+  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -20,4 +22,4 @@ mkDerivation {
   description = "Singleton Tuple";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/PyF.nix b/pkgs/PyF.nix
index d9cb229ffe9b62cb89bfd66062326c7daaaa6936..9e5086b68b7dee3191cdb1a4523cd0c3877a809b 100644
--- a/pkgs/PyF.nix
+++ b/pkgs/PyF.nix
@@ -1,51 +1,20 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, deepseq
-, filepath
-, ghc
-, ghc-boot
-, hspec
-, lib
-, mtl
-, parsec
-, process
-, template-haskell
-, temporary
-, text
-, time
+{ mkDerivation, HUnit, base, bytestring, deepseq, filepath, ghc
+, hspec, lib, mtl, parsec, process, template-haskell, temporary
+, text, time
 }:
 mkDerivation {
   pname = "PyF";
-  version = "0.11.1.0";
-  sha256 = "8fd451ac23e5e63813c464e1a8ac98ba5c2fb11599441c80fe9ebc0186e61c1f";
+  version = "0.11.1.1";
+  sha256 = "f3607099f3357bce93bf1b3034c702b833d1114966b922267136340f262d3324";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ghc
-    ghc-boot
-    mtl
-    parsec
-    template-haskell
-    text
-    time
+    base bytestring ghc mtl parsec template-haskell text time
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    filepath
-    hspec
-    HUnit
-    process
-    template-haskell
-    temporary
-    text
-    time
+    base bytestring deepseq filepath hspec HUnit process
+    template-haskell temporary text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -57,4 +26,4 @@ mkDerivation {
   description = "Quasiquotations for a python like interpolated string formatter";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/aeson.nix b/pkgs/aeson.nix
index a6825277fe48ea0735eb39ada4f118b612110626..24ce8de9b651df405364bd99265f0ba4efaff1a9 100644
--- a/pkgs/aeson.nix
+++ b/pkgs/aeson.nix
@@ -1,129 +1,39 @@
-{ mkDerivation
-, Diff
-, OneTuple
-, QuickCheck
-, attoparsec
-, base
-, base-compat
-, base-compat-batteries
-, base-orphans
-, base16-bytestring
-, bytestring
-, containers
-, data-fix
-, deepseq
-, directory
-, dlist
-, filepath
-, generic-deriving
-, generically
-, ghc-prim
-, hashable
-, indexed-traversable
-, integer-logarithms
-, lib
-, primitive
-, quickcheck-instances
-, scientific
-, semialign
-, strict
-, tagged
-, tasty
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
-, text-short
-, th-abstraction
-, these
-, time
-, time-compat
-, unordered-containers
-, uuid-types
-, vector
-, witherable
+{ mkDerivation, Diff, OneTuple, QuickCheck, attoparsec, base
+, base-compat, base-compat-batteries, base-orphans
+, base16-bytestring, bytestring, containers, data-fix, deepseq
+, directory, dlist, exceptions, filepath, generic-deriving
+, generically, ghc-prim, hashable, indexed-traversable
+, integer-logarithms, lib, primitive, quickcheck-instances
+, scientific, semialign, strict, tagged, tasty, tasty-golden
+, tasty-hunit, tasty-quickcheck, template-haskell, text, text-short
+, th-abstraction, these, time, time-compat, unordered-containers
+, uuid-types, vector, witherable
 }:
 mkDerivation {
   pname = "aeson";
-  version = "2.1.0.0";
-  sha256 = "0a763ef5fa16da678e5a1ee8c394825b6723182a9a755709170edc08b8f73c94";
+  version = "2.1.2.1";
+  sha256 = "5d4042b903ce181ee023bbf908f37a3f55e820c5f0df102683b87f963e3522c6";
   revision = "2";
-  editedCabalFile = "0yp12cmkj5sz25kxzn6g1fz2d6acbq5rvff5dg2wg5zkjwfkhzqj";
+  editedCabalFile = "16ykqg5051pbqrqx0gp3zb3gvfgl5sm3wdnym9y6gv7mg525jkn8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    base-compat-batteries
-    bytestring
-    containers
-    data-fix
-    deepseq
-    dlist
-    generically
-    ghc-prim
-    hashable
-    indexed-traversable
-    OneTuple
-    primitive
-    QuickCheck
-    scientific
-    semialign
-    strict
-    tagged
-    template-haskell
-    text
-    text-short
-    th-abstraction
-    these
-    time
-    time-compat
-    unordered-containers
-    uuid-types
-    vector
-    witherable
+    attoparsec base base-compat-batteries bytestring containers
+    data-fix deepseq dlist exceptions generically ghc-prim hashable
+    indexed-traversable OneTuple primitive QuickCheck scientific
+    semialign strict tagged template-haskell text text-short
+    th-abstraction these time time-compat unordered-containers
+    uuid-types vector witherable
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    base-compat
-    base-orphans
-    base16-bytestring
-    bytestring
-    containers
-    data-fix
-    Diff
-    directory
-    dlist
-    filepath
-    generic-deriving
-    generically
-    ghc-prim
-    hashable
-    indexed-traversable
-    integer-logarithms
-    OneTuple
-    primitive
-    QuickCheck
-    quickcheck-instances
-    scientific
-    strict
-    tagged
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
-    text
-    text-short
-    these
-    time
-    time-compat
-    unordered-containers
-    uuid-types
-    vector
+    attoparsec base base-compat base-orphans base16-bytestring
+    bytestring containers data-fix Diff directory dlist filepath
+    generic-deriving generically ghc-prim hashable indexed-traversable
+    integer-logarithms OneTuple primitive QuickCheck
+    quickcheck-instances scientific strict tagged tasty tasty-golden
+    tasty-hunit tasty-quickcheck template-haskell text text-short these
+    time time-compat unordered-containers uuid-types vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -136,4 +46,4 @@ mkDerivation {
   description = "Fast JSON parsing and encoding";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/algebraic-graphs.nix b/pkgs/algebraic-graphs.nix
index 6b7799ea577531b78e287ba46c087d8b4bac323f..6bf44c33aee64636b4d288d1b6a4e6762c26db6b 100644
--- a/pkgs/algebraic-graphs.nix
+++ b/pkgs/algebraic-graphs.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, containers
-, deepseq
-, extra
-, inspection-testing
-, lib
-, transformers
+{ mkDerivation, QuickCheck, array, base, containers, deepseq, extra
+, inspection-testing, lib, transformers
 }:
 mkDerivation {
   pname = "algebraic-graphs";
@@ -17,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    deepseq
-    transformers
+    array base containers deepseq transformers
   ];
   testHaskellDepends = [
-    array
-    base
-    containers
-    deepseq
-    extra
-    inspection-testing
-    QuickCheck
+    array base containers deepseq extra inspection-testing QuickCheck
     transformers
   ];
   enableLibraryProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "A library for algebraic graph construction and transformation";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ansi-terminal.nix b/pkgs/ansi-terminal.nix
index 5819c131575839c425d2b132bf8ad901efb8f195..5dbec80ad5b8e7b5b73ba67142e7fc91a01614f9 100644
--- a/pkgs/ansi-terminal.nix
+++ b/pkgs/ansi-terminal.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, colour, lib }:
 mkDerivation {
   pname = "ansi-terminal";
-  version = "0.11.3";
-  sha256 = "f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b";
+  version = "0.11.4";
+  sha256 = "7898e48f0a535c1857cde52c803f28096ba89759461fe4d157fd55dcdb420e25";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Simple ANSI terminal support, with Windows compatibility";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/apply-refact.nix b/pkgs/apply-refact.nix
index e927e9984b63b814cb697520b1a50d317e34aa15..2d75fe97daa6bf95138a01e0b30355ecc228faeb 100644
--- a/pkgs/apply-refact.nix
+++ b/pkgs/apply-refact.nix
@@ -1,92 +1,30 @@
-{ mkDerivation
-, base
-, containers
-, directory
-, extra
-, filemanip
-, filepath
-, ghc
-, ghc-boot-th
-, ghc-exactprint
-, ghc-paths
-, lib
-, optparse-applicative
-, process
-, refact
-, silently
-, syb
-, tasty
-, tasty-expected-failure
-, tasty-golden
-, transformers
-, uniplate
+{ mkDerivation, base, containers, directory, extra, filemanip
+, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, lib
+, optparse-applicative, process, refact, silently, syb, tasty
+, tasty-expected-failure, tasty-golden, transformers, uniplate
 , unix-compat
 }:
 mkDerivation {
   pname = "apply-refact";
-  version = "0.11.0.0";
-  sha256 = "e27c77d86991fa781dd68323f58b29ccd90f178ba9878a58b838bf02914eb5ae";
+  version = "0.12.0.0";
+  sha256 = "cc1fa24dd2cc02591217363eb0c3852ff215a124a3d28ee9d46cd7f29fdf9477";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    directory
-    extra
-    filemanip
-    ghc
-    ghc-boot-th
-    ghc-exactprint
-    ghc-paths
-    process
-    refact
-    syb
-    transformers
-    uniplate
-    unix-compat
+    base containers directory extra filemanip ghc ghc-boot-th
+    ghc-exactprint process refact syb transformers uniplate unix-compat
   ];
   executableHaskellDepends = [
-    base
-    containers
-    directory
-    extra
-    filemanip
-    filepath
-    ghc
-    ghc-boot-th
-    ghc-exactprint
-    ghc-paths
-    optparse-applicative
-    process
-    refact
-    syb
-    transformers
-    uniplate
-    unix-compat
+    base containers directory extra filemanip filepath ghc ghc-boot-th
+    ghc-exactprint ghc-paths optparse-applicative process refact syb
+    transformers uniplate unix-compat
   ];
   testHaskellDepends = [
-    base
-    containers
-    directory
-    extra
-    filemanip
-    filepath
-    ghc
-    ghc-boot-th
-    ghc-exactprint
-    ghc-paths
-    optparse-applicative
-    process
-    refact
-    silently
-    syb
-    tasty
-    tasty-expected-failure
-    tasty-golden
-    transformers
-    uniplate
-    unix-compat
+    base containers directory extra filemanip filepath ghc ghc-boot-th
+    ghc-exactprint ghc-paths optparse-applicative process refact
+    silently syb tasty tasty-expected-failure tasty-golden transformers
+    uniplate unix-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -99,4 +37,4 @@ mkDerivation {
   description = "Perform refactorings specified by the refact library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/autodocodec-schema.nix b/pkgs/autodocodec-schema.nix
index eed8022d3ecee10207af50f3ba85fbe6b6b0b3a5..b47e0b5ce8856970611db86826545bdbd062349a 100644
--- a/pkgs/autodocodec-schema.nix
+++ b/pkgs/autodocodec-schema.nix
@@ -1,36 +1,17 @@
-{ mkDerivation
-, aeson
-, autodocodec
-, base
-, containers
-, lib
-, mtl
-, text
-, unordered-containers
-, validity
-, validity-aeson
-, validity-containers
-, validity-text
+{ 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.2";
-  sha256 = "7178bc6b356bf744918202312a71eb0c4fb9b2dfe70680c4acd8d8a5d0977c6f";
+  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
+    aeson autodocodec base containers mtl text unordered-containers
+    validity validity-aeson validity-containers validity-text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +24,4 @@ mkDerivation {
   description = "Autodocodec interpreters for JSON Schema";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/autodocodec.nix b/pkgs/autodocodec.nix
index edb955abf99ffe7eb1fb73265b470fc7de9022ca..5307435955951d6ab54d89ff20a827a75dd55669 100644
--- a/pkgs/autodocodec.nix
+++ b/pkgs/autodocodec.nix
@@ -1,40 +1,17 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, hashable
-, lib
-, mtl
-, scientific
-, text
-, time
-, unordered-containers
-, validity
-, validity-scientific
-, vector
+{ mkDerivation, aeson, base, bytestring, containers, hashable, lib
+, mtl, scientific, text, time, unordered-containers, validity
+, validity-scientific, vector
 }:
 mkDerivation {
   pname = "autodocodec";
-  version = "0.2.0.1";
-  sha256 = "4f4e2c2c57608a7e3060247a0f1b86e3f1257c2ba15af3c4649b9d87a6155bde";
+  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
+    aeson base bytestring containers hashable mtl scientific text time
+    unordered-containers validity validity-scientific vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +24,4 @@ mkDerivation {
   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
index 164458b63d56a18bcaabe621a4feacf2fa799342..6cbe4ed90a8444c7571e7f0344cccbc2e0658380 100644
--- a/pkgs/barbies.nix
+++ b/pkgs/barbies.nix
@@ -1,28 +1,16 @@
-{ mkDerivation
-, QuickCheck
-, base
-, distributive
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, transformers
+{ mkDerivation, QuickCheck, base, distributive, lib, tasty
+, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "barbies";
-  version = "2.0.3.1";
-  sha256 = "a13c1fd05e3e006bd0874d77e1930c5225765e83fa9925b2c5c1df314559df3d";
+  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
+    base distributive QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +23,4 @@ mkDerivation {
   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
index 6c28b91dae84a83296fa6f5183d09c5161d1a568..89bb6d7cd830d2a1c81a85f014e04a7a8f5811ce 100644
--- a/pkgs/base-compat-batteries.nix
+++ b/pkgs/base-compat-batteries.nix
@@ -1,20 +1,16 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
+{ mkDerivation, OneTuple, QuickCheck, base, base-compat
+, foldable1-classes-compat, ghc-prim, hspec, hspec-discover, lib
 }:
 mkDerivation {
   pname = "base-compat-batteries";
-  version = "0.12.2";
-  sha256 = "ede9092e07f904e0759160bf1ecd3fb7eb043bae6dc89a37c3dc94829ec5eb99";
+  version = "0.13.0";
+  sha256 = "3768af40d1d64f9b0845a8ddb18e63ba3a4c765d0d96db9dc28b5b66d1232f98";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base base-compat ghc-prim ];
+  libraryHaskellDepends = [
+    base base-compat foldable1-classes-compat ghc-prim OneTuple
+  ];
   testHaskellDepends = [ base hspec QuickCheck ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -27,4 +23,4 @@ mkDerivation {
   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
index 79eb2e98dc641b09050dd72fcd7c472bcde7f578..f1f4bf55a2c31aef9a7ae662a56a012c8673c583 100644
--- a/pkgs/base-compat.nix
+++ b/pkgs/base-compat.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, ghc-prim, lib, unix }:
 mkDerivation {
   pname = "base-compat";
-  version = "0.12.2";
-  sha256 = "a62adc883a5ac436f80e4ae02c3c56111cf1007492f267c291139a668d2150bd";
+  version = "0.13.0";
+  sha256 = "8bf66075da849a037974a7feb9d7ecd81ce57e4522a0df40daf11db14fcea30d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,4 +17,4 @@ mkDerivation {
   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
index 9fcb337beb23864ebd6c463a251103f322d364a8..f183e5d5a4537d2226f3a1835c00adcac5130bc3 100644
--- a/pkgs/base-orphans.nix
+++ b/pkgs/base-orphans.nix
@@ -1,15 +1,10 @@
-{ mkDerivation
-, QuickCheck
-, base
-, ghc-prim
-, hspec
-, hspec-discover
+{ mkDerivation, QuickCheck, base, ghc-prim, hspec, hspec-discover
 , lib
 }:
 mkDerivation {
   pname = "base-orphans";
-  version = "0.8.7";
-  sha256 = "888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447";
+  version = "0.9.0";
+  sha256 = "613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -27,4 +22,4 @@ mkDerivation {
   description = "Backwards-compatible orphan instances for base";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/binary-orphans.nix b/pkgs/binary-orphans.nix
index 965648563326b60bff3ba5be063af0cdb7de6f49..a62abd4e41a9dfe09dd216865528bfc801453eff 100644
--- a/pkgs/binary-orphans.nix
+++ b/pkgs/binary-orphans.nix
@@ -1,31 +1,19 @@
-{ mkDerivation
-, OneTuple
-, QuickCheck
-, base
-, binary
-, lib
-, quickcheck-instances
-, tagged
-, tasty
-, tasty-quickcheck
+{ mkDerivation, OneTuple, QuickCheck, base, binary, lib
+, quickcheck-instances, tagged, tasty, tasty-quickcheck
 , transformers
 }:
 mkDerivation {
   pname = "binary-orphans";
-  version = "1.0.3";
-  sha256 = "e2e554823ce6758cbbfb64acb8b5905d3c226eab18b5fcaf5d7c79252114602c";
+  version = "1.0.4.1";
+  sha256 = "5f5b789bc86d25bbd054b86b2d9a6a03f4ac0dd480f283564b6d6465cfa2f0d2";
+  revision = "2";
+  editedCabalFile = "1q9fbn41fi4wfk8mrm9izy5jna86gmy7gxhz94crqfhp5f89v58l";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base binary transformers ];
   testHaskellDepends = [
-    base
-    binary
-    OneTuple
-    QuickCheck
-    quickcheck-instances
-    tagged
-    tasty
+    base binary OneTuple QuickCheck quickcheck-instances tagged tasty
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -38,4 +26,4 @@ mkDerivation {
   description = "Compatibility package for binary; provides instances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/blaze-textual.nix b/pkgs/blaze-textual.nix
index 65575267278b7ff967fa95d174f3bb52b5b2dc53..8fd43eb1992b6913641d411bb7ecaf75f2615286 100644
--- a/pkgs/blaze-textual.nix
+++ b/pkgs/blaze-textual.nix
@@ -1,45 +1,21 @@
-{ mkDerivation
-, QuickCheck
-, base
-, blaze-builder
-, bytestring
-, double-conversion
-, ghc-prim
-, integer-gmp
-, lib
-, old-locale
-, test-framework
-, test-framework-quickcheck2
-, text
-, time
-, vector
+{ mkDerivation, QuickCheck, base, blaze-builder, bytestring
+, double-conversion, ghc-prim, integer-gmp, lib, old-locale
+, test-framework, test-framework-quickcheck2, text, vector
 }:
 mkDerivation {
   pname = "blaze-textual";
-  version = "0.2.2.1";
-  sha256 = "7a9199740189f435b762d98e65f5d7c0c7a1467e36c11210a8d65e76a5e5567e";
+  version = "0.2.3.1";
+  sha256 = "dd2acac978433e4001302190e530829707203febbc664966c3d347ecac5717b2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    ghc-prim
-    integer-gmp
-    old-locale
-    text
-    time
+    base blaze-builder bytestring ghc-prim integer-gmp old-locale text
     vector
   ];
   testHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    double-conversion
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
+    base blaze-builder bytestring double-conversion QuickCheck
+    test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,8 +24,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/bos/blaze-textual";
+  homepage = "http://github.com/swamp-agr/blaze-textual";
   description = "Fast rendering of common datatypes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/boring.nix b/pkgs/boring.nix
index 7649285fcf5795f70fb0ac59253ddc26a1f02303..61ca27daf657a09b70ab7ec9b7fb86f87e744447 100644
--- a/pkgs/boring.nix
+++ b/pkgs/boring.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, lib, tagged, transformers }:
 mkDerivation {
   pname = "boring";
-  version = "0.2";
-  sha256 = "0bac533b66e754d4fc65ab8d7557eea6f7b35d16998e5e74579b25a372aa4c34";
-  revision = "2";
-  editedCabalFile = "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828";
+  version = "0.2.1";
+  sha256 = "b1ffddf0f9d50ac8742aa01b270856d57937cc8f7aae783e3b5f3abee7aa3154";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +18,4 @@ mkDerivation {
   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 7b9c05868f1f288d8cf3ade0c3ca324989cbd048..3d28060faf11e15c6190e7be6ee5470117a0b02b 100644
--- a/pkgs/breakpoint.nix
+++ b/pkgs/breakpoint.nix
@@ -1,36 +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, ghc, haskeline
+, lib, mtl, pretty-simple, tasty, tasty-hunit, template-haskell
+, text, transformers
 }:
 mkDerivation {
   pname = "breakpoint";
-  version = "0.1.1.1";
-  sha256 = "e24a2cafa6ea866b571fe50bcc49fbf64c14244d985918e9ffe2c7c789d5cec3";
+  version = "0.1.2.1";
+  sha256 = "059ac45a5d9e650d61db8167062636f0029ac6ff3c27b1fa3faccc5c195b43ae";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    containers
-    ghc
-    haskeline
-    mtl
-    pretty-simple
-    template-haskell
-    text
-    transformers
+    ansi-terminal base containers ghc haskeline mtl pretty-simple
+    template-haskell text transformers
   ];
   testHaskellDepends = [ base containers tasty tasty-hunit ];
   enableLibraryProfiling = true;
@@ -43,4 +24,4 @@ mkDerivation {
   description = "Set breakpoints using a GHC plugin";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/brick.nix b/pkgs/brick.nix
index 165dd5c4daacaa4a36870538c7ad7a4d137503e9..f078bac3b2f7d61c82e1a33692e5c68345725c19 100644
--- a/pkgs/brick.nix
+++ b/pkgs/brick.nix
@@ -1,69 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bimap
-, bytestring
-, config-ini
-, containers
-, contravariant
-, data-clist
-, deepseq
-, directory
-, exceptions
-, filepath
-, lib
-, microlens
-, microlens-mtl
-, microlens-th
-, mtl
-, stm
-, template-haskell
-, text
-, text-zipper
-, unix
-, vector
-, vty
+{ mkDerivation, QuickCheck, base, bimap, bytestring, config-ini
+, containers, contravariant, data-clist, deepseq, directory
+, exceptions, filepath, lib, microlens, microlens-mtl, microlens-th
+, mtl, stm, template-haskell, text, text-zipper, unix, vector, vty
 , word-wrap
 }:
 mkDerivation {
   pname = "brick";
-  version = "1.3";
-  sha256 = "4b4320ff8e6161dfe7034c7deb911f4187551c389c1d6b14501b285f9031ed52";
+  version = "1.6";
+  sha256 = "463dfba63a279cac25398a1b36f36677d487f56efba6c6ce595d65e7d1157da3";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bimap
-    bytestring
-    config-ini
-    containers
-    contravariant
-    data-clist
-    deepseq
-    directory
-    exceptions
-    filepath
-    microlens
-    microlens-mtl
-    microlens-th
-    mtl
-    stm
-    template-haskell
-    text
-    text-zipper
-    unix
-    vector
-    vty
-    word-wrap
+    base bimap bytestring config-ini containers contravariant
+    data-clist deepseq directory exceptions filepath microlens
+    microlens-mtl microlens-th mtl stm template-haskell text
+    text-zipper unix vector vty word-wrap
   ];
   testHaskellDepends = [
-    base
-    containers
-    microlens
-    QuickCheck
-    vector
-    vty
+    base containers microlens QuickCheck vector vty
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -76,4 +31,4 @@ mkDerivation {
   description = "A declarative terminal user interface library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/citeproc.nix b/pkgs/citeproc.nix
index 001ce19bd51cdb88818b76358b584b3586a5e0a6..d010f9cdd13f55f6e37e6a1c4c2d69edb94b0d70 100644
--- a/pkgs/citeproc.nix
+++ b/pkgs/citeproc.nix
@@ -1,69 +1,24 @@
-{ mkDerivation
-, Diff
-, aeson
-, attoparsec
-, base
-, bytestring
-, case-insensitive
-, containers
-, data-default
-, directory
-, file-embed
-, filepath
-, lib
-, mtl
-, pandoc-types
-, pretty
-, safe
-, scientific
-, text
-, timeit
-, transformers
-, unicode-collation
-, uniplate
-, vector
+{ mkDerivation, Diff, aeson, attoparsec, base, bytestring
+, case-insensitive, containers, data-default, directory, file-embed
+, filepath, lib, mtl, pandoc-types, pretty, safe, scientific, text
+, timeit, transformers, unicode-collation, uniplate, vector
 , xml-conduit
 }:
 mkDerivation {
   pname = "citeproc";
-  version = "0.8.0.1";
-  sha256 = "67a852a7a9e0fa00713996e546045c11360ad9374e450cfe35154e69a0bfbfb7";
+  version = "0.8.1";
+  sha256 = "33523bbd8c38f72c6d606e02d11b93254171f801be4f2a0cb4d34d6626426400";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    bytestring
-    case-insensitive
-    containers
-    data-default
-    file-embed
-    filepath
-    pandoc-types
-    safe
-    scientific
-    text
-    transformers
-    unicode-collation
-    uniplate
-    vector
-    xml-conduit
+    aeson attoparsec base bytestring case-insensitive containers
+    data-default file-embed filepath pandoc-types safe scientific text
+    transformers unicode-collation uniplate vector xml-conduit
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    Diff
-    directory
-    filepath
-    mtl
-    pretty
-    text
-    timeit
-    transformers
+    aeson base bytestring containers Diff directory filepath mtl pretty
+    text timeit transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -75,4 +30,4 @@ mkDerivation {
   description = "Generates citations and bibliography from CSL styles";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cmdargs.nix b/pkgs/cmdargs.nix
index 311812dc5d6e5730d1e9b95fd5fd35a8f8a70557..043cd0ce3924c12eb1431b0d5bfc9fe60417ceb8 100644
--- a/pkgs/cmdargs.nix
+++ b/pkgs/cmdargs.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, filepath
-, lib
-, process
-, template-haskell
+{ mkDerivation, base, filepath, lib, process, template-haskell
 , transformers
 }:
 mkDerivation {
   pname = "cmdargs";
-  version = "0.10.21";
-  sha256 = "f7d8ea5c4e6af368d9b5d2eb994fc29235406fbe91916a6dc63bd883025eca75";
+  version = "0.10.22";
+  sha256 = "b8b12e7f8795cf13037bb062d453b86c788eae62558586f59e9419aabe6e9bef";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    filepath
-    process
-    template-haskell
-    transformers
+    base filepath process template-haskell transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   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 3d85fd7c51e12a137bd57500df6551740fefdc69..a98f7929087a46bcb4fdaaa771f3403df20e8463 100644
--- a/pkgs/co-log-core.nix
+++ b/pkgs/co-log-core.nix
@@ -1,8 +1,8 @@
 { mkDerivation, Glob, base, doctest, lib }:
 mkDerivation {
   pname = "co-log-core";
-  version = "0.3.1.0";
-  sha256 = "29720bee51dd0c89f35e27b89985a469a0436dc58750f4825874572e2a6317ec";
+  version = "0.3.2.0";
+  sha256 = "3495edd3a0c4a1bf4b9dbc30df0a23bdb14848f57a8b71cfa81511ab38c11ee5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Composable Contravariant Comonadic Logging Library";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/commonmark-extensions.nix b/pkgs/commonmark-extensions.nix
index adc0670ce3ba5aaa62a70c4bf7c4fc9a26c5dc46..7f90c69abd10bd813aaaea175d7767c8b51aed35 100644
--- a/pkgs/commonmark-extensions.nix
+++ b/pkgs/commonmark-extensions.nix
@@ -1,43 +1,20 @@
-{ mkDerivation
-, base
-, commonmark
-, containers
-, emojis
-, filepath
-, lib
-, network-uri
-, parsec
-, tasty
-, tasty-bench
-, tasty-hunit
-, text
+{ mkDerivation, base, commonmark, containers, emojis, filepath, lib
+, network-uri, parsec, tasty, tasty-bench, tasty-hunit, text
 , transformers
 }:
 mkDerivation {
   pname = "commonmark-extensions";
-  version = "0.2.3.3";
-  sha256 = "f41efcf3cc0b876437de8dc69accf8cab9674b77325a6bf038caf62e96ce3e01";
+  version = "0.2.3.4";
+  sha256 = "a084efe90311f8a0d83d8622ef76f17dfdb974a84b74df454cf906b0ee64665e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    commonmark
-    containers
-    emojis
-    filepath
-    network-uri
-    parsec
-    text
+    base commonmark containers emojis filepath network-uri parsec text
     transformers
   ];
   testHaskellDepends = [
-    base
-    commonmark
-    parsec
-    tasty
-    tasty-hunit
-    text
+    base commonmark parsec tasty tasty-hunit text
   ];
   benchmarkHaskellDepends = [ base commonmark tasty-bench text ];
   enableLibraryProfiling = true;
@@ -51,4 +28,4 @@ mkDerivation {
   description = "Pure Haskell commonmark parser";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/commonmark-pandoc.nix b/pkgs/commonmark-pandoc.nix
index 3d10bf9f6a2753342745c7d0071a1d24c2c7402b..cc3c42b63ec01abb1df340e45c58f675bff81f03 100644
--- a/pkgs/commonmark-pandoc.nix
+++ b/pkgs/commonmark-pandoc.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, commonmark
-, commonmark-extensions
-, lib
-, pandoc-types
-, text
+{ mkDerivation, base, commonmark, commonmark-extensions, lib
+, pandoc-types, text
 }:
 mkDerivation {
   pname = "commonmark-pandoc";
-  version = "0.2.1.2";
-  sha256 = "57554ecd0d1eacdf094e4ca346a9212e0198b467d86153b8494b412df747f1b6";
+  version = "0.2.1.3";
+  sha256 = "77adcf9074299a5b318901d057ebf49a7f032245f2aee783ef475539b0897f21";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    commonmark
-    commonmark-extensions
-    pandoc-types
-    text
+    base commonmark commonmark-extensions pandoc-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Bridge between commonmark and pandoc AST";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/commutative-semigroups.nix b/pkgs/commutative-semigroups.nix
new file mode 100644
index 0000000000000000000000000000000000000000..789dca0442f30123b1cbfa62d6e5f3270df607cc
--- /dev/null
+++ b/pkgs/commutative-semigroups.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, base, containers, lib }:
+mkDerivation {
+  pname = "commutative-semigroups";
+  version = "0.1.0.0";
+  sha256 = "661d41ac7fbab17bdc5ebb7eafeecc597616cc5a1c7fce1b07722aa8bc1a0618";
+  revision = "3";
+  editedCabalFile = "1g3z3w70hgcbkpf298pnafslx4f2pv9gs6vbgyx215y2p8amvn6s";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base containers ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  description = "Commutative semigroups";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/composite-base.nix b/pkgs/composite-base.nix
index 226a9cd08fab782af980d93ad2e86d87e26efbd1..9eca883b45de734a8314f830b35fa7fddcb53e9a 100644
--- a/pkgs/composite-base.nix
+++ b/pkgs/composite-base.nix
@@ -1,59 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, exceptions
-, hspec
-, lens
-, lib
-, monad-control
-, mtl
-, profunctors
-, template-haskell
-, text
-, transformers
-, transformers-base
-, unliftio-core
-, vinyl
+{ mkDerivation, QuickCheck, base, deepseq, exceptions, hspec, lens
+, lib, monad-control, mtl, profunctors, template-haskell, text
+, transformers, transformers-base, unliftio-core, vinyl
 }:
 mkDerivation {
   pname = "composite-base";
-  version = "0.8.1.0";
-  sha256 = "a8de050a65b8d3febfd48ea0d7b9bb215c8473b7dda7760d7c2df279a92258a3";
+  version = "0.8.2.1";
+  sha256 = "31b7fe24885d2db164524a4477058157592ae06a75da5259f0eafc5760555544";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    exceptions
-    lens
-    monad-control
-    mtl
-    profunctors
-    template-haskell
-    text
-    transformers
-    transformers-base
-    unliftio-core
+    base deepseq exceptions lens monad-control mtl profunctors
+    template-haskell text transformers transformers-base unliftio-core
     vinyl
   ];
   testHaskellDepends = [
-    base
-    deepseq
-    exceptions
-    hspec
-    lens
-    monad-control
-    mtl
-    profunctors
-    QuickCheck
-    template-haskell
-    text
-    transformers
-    transformers-base
-    unliftio-core
-    vinyl
+    base deepseq exceptions hspec lens monad-control mtl profunctors
+    QuickCheck template-haskell text transformers transformers-base
+    unliftio-core vinyl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -66,4 +30,4 @@ mkDerivation {
   description = "Shared utilities for composite-* packages";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/concurrent-output.nix b/pkgs/concurrent-output.nix
index 56d804c6c385dd938bb91e6912ef45c510291b60..121c179679844420d35127b3baface69b70cfbe3 100644
--- a/pkgs/concurrent-output.nix
+++ b/pkgs/concurrent-output.nix
@@ -1,36 +1,16 @@
-{ mkDerivation
-, ansi-terminal
-, async
-, base
-, directory
-, exceptions
-, lib
-, process
-, stm
-, terminal-size
-, text
-, transformers
-, unix
+{ mkDerivation, ansi-terminal, async, base, directory, exceptions
+, lib, process, stm, terminal-size, text, transformers, unix
 }:
 mkDerivation {
   pname = "concurrent-output";
-  version = "1.10.16";
-  sha256 = "b0aa45d8707f504623ed8abc67873bc139fefdb3e391e054c6adad82e7029350";
+  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
+    ansi-terminal async base directory exceptions process stm
+    terminal-size text transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +22,4 @@ mkDerivation {
   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.nix b/pkgs/conduit.nix
index a00fe403a85447baf444a960e49edc18bea021ce..0898837261b8dcb8403ee77d7c47b495f3b74a5a 100644
--- a/pkgs/conduit.nix
+++ b/pkgs/conduit.nix
@@ -1,84 +1,30 @@
-{ 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, 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.2";
-  sha256 = "2cb9832f27c7cd50daed1309f688afc4da1bd49697cbeda8ec3f81ab0bcf2197";
+  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
+    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
+    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
+    base containers deepseq gauge hspec kan-extensions mwc-random
+    transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -91,4 +37,4 @@ mkDerivation {
   description = "Streaming data processing library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/constraints-extras.nix b/pkgs/constraints-extras.nix
index e18d8d24f0f724c57a9fef1bc6b63c96d0fb2daf..46f36605e72c57760283c15054db867483e04523 100644
--- a/pkgs/constraints-extras.nix
+++ b/pkgs/constraints-extras.nix
@@ -1,10 +1,8 @@
 { mkDerivation, aeson, base, constraints, lib, template-haskell }:
 mkDerivation {
   pname = "constraints-extras";
-  version = "0.3.2.1";
-  sha256 = "d7f571c6634105e8fbb5ad6685775c7d06e84cd4ece51dfd4276e2fe34e65c70";
-  revision = "1";
-  editedCabalFile = "1smha6ljia9bfgdy1h0lkgi9464rwa9lnw7rqfi1c23pzyiw13lh";
+  version = "0.4.0.0";
+  sha256 = "f639594f340986e7647616194dec57a85490ca60e3b0f5197d011675da242ec7";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -21,4 +19,4 @@ mkDerivation {
   description = "Utility package for constraints";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cookie.nix b/pkgs/cookie.nix
index 10f4583006740699e283a125b11819ea25f7cb94..83a6b0dd68e35787da56d86becb6255a8b9c2d2b 100644
--- a/pkgs/cookie.nix
+++ b/pkgs/cookie.nix
@@ -1,42 +1,20 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, data-default-class
-, deepseq
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, time
+{ mkDerivation, HUnit, QuickCheck, base, bytestring
+, data-default-class, deepseq, lib, tasty, tasty-hunit
+, tasty-quickcheck, text, time
 }:
 mkDerivation {
   pname = "cookie";
-  version = "0.4.5";
-  sha256 = "707f94d1b31018b91d6a1e9e19ef5413e20d02cab00ad93a5fd7d7b3b46a3583";
+  version = "0.4.6";
+  sha256 = "8c41a956c32b9733d525a53d43b0338a236a34d36658ecc4364c8249a6664baa";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    data-default-class
-    deepseq
-    text
-    time
+    base bytestring data-default-class deepseq text time
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
-    time
+    base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+    text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +27,4 @@ mkDerivation {
   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
index 9a8ac5742b0ae735985b866ad2a8642afd6596bf..a8527721ebe9c9ecdaddc23258f2ab4cc8740f66 100644
--- a/pkgs/criterion-measurement.nix
+++ b/pkgs/criterion-measurement.nix
@@ -1,28 +1,15 @@
-{ mkDerivation
-, aeson
-, base
-, base-compat
-, binary
-, containers
-, deepseq
-, lib
-, vector
+{ mkDerivation, aeson, base, base-compat, binary, containers
+, deepseq, ghc-prim, lib, vector
 }:
 mkDerivation {
   pname = "criterion-measurement";
-  version = "0.2.0.0";
-  sha256 = "4a1a50d74341ee23ad7250da8eafdd0a40bcd4d08836ec76c956dcc1c9b2cab3";
+  version = "0.2.1.0";
+  sha256 = "ddce822e11be48a56ac1cb3c752847ac5fe04743728268207482aee8713eeda5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat
-    binary
-    containers
-    deepseq
-    vector
+    aeson base base-compat binary containers deepseq ghc-prim vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   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 c8bb9820e1b4853fe9129daf3612ab2a9253ff39..25005306cff621a0e57c103c0b5b9f820e566891 100644
--- a/pkgs/criterion.nix
+++ b/pkgs/criterion.nix
@@ -1,101 +1,35 @@
-{ 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, 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 {
   pname = "criterion";
-  version = "1.5.13.0";
-  sha256 = "e2a8545eb62340ecb3c93b156495cd76cd0ef7d63c026904297f0afe1aa579a7";
-  revision = "2";
-  editedCabalFile = "09s70kqkp1j78idaqrpnz8v870vy6xyclnpz9g4x70cr4r67lqkd";
+  version = "1.6.0.0";
+  sha256 = "4029ef9ccd158e995a97827bb50d189a98a0875ea4b73300276fac1510a252b0";
+  revision = "1";
+  editedCabalFile = "1sq1izskw1j1dxrdak8zxv22q3cvxg7s9wvxx3l2gj0165xj83bc";
   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
+    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
   ];
   executableHaskellDepends = [
-    base
-    base-compat-batteries
-    optparse-applicative
+    base base-compat-batteries optparse-applicative
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    base-compat-batteries
-    bytestring
-    deepseq
-    directory
-    HUnit
-    QuickCheck
-    statistics
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    vector
+    aeson base base-compat base-compat-batteries bytestring deepseq
+    directory HUnit QuickCheck statistics tasty tasty-hunit
+    tasty-quickcheck vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -108,4 +42,4 @@ mkDerivation {
   description = "Robust, reliable performance measurement and analysis";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/deferred-folds.nix b/pkgs/deferred-folds.nix
index 15f4407c20eef4bc4bd9b8e023261f8421686cef..d3b06c520cb2378546c44a92ee59900e3b62bf88 100644
--- a/pkgs/deferred-folds.nix
+++ b/pkgs/deferred-folds.nix
@@ -1,47 +1,21 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, foldl
-, hashable
-, lib
-, primitive
-, quickcheck-instances
-, rerebase
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, base, bytestring, containers, foldl
+, hashable, lib, primitive, quickcheck-instances, rerebase, tasty
+, tasty-hunit, tasty-quickcheck, text, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "deferred-folds";
-  version = "0.9.18.2";
-  sha256 = "26ddc60183478033735f82ba506db93032fb8c7fe91b7e72a0d8f9f05febb42a";
+  version = "0.9.18.3";
+  sha256 = "3b2130eaa080d199380ad6a139c4eb8198ccc9291b5878dcb5aeb15b19f64774";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    foldl
-    hashable
-    primitive
-    text
-    transformers
-    unordered-containers
-    vector
+    base bytestring containers foldl hashable primitive text
+    transformers unordered-containers vector
   ];
   testHaskellDepends = [
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -55,4 +29,4 @@ mkDerivation {
   description = "Abstractions over deferred folds";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dependent-sum.nix b/pkgs/dependent-sum.nix
index 0580da0541022ca4eaa1a2fc65166f45830dedf5..67d8b4eee875ea6c67d3d53d33df061cc12bb903 100644
--- a/pkgs/dependent-sum.nix
+++ b/pkgs/dependent-sum.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, constraints-extras, lib, some }:
 mkDerivation {
   pname = "dependent-sum";
-  version = "0.7.1.0";
-  sha256 = "81cb55907f321f62bea095ae72e9711095c4cb7378fa66fbabc483a9f61b462a";
-  revision = "2";
-  editedCabalFile = "0d7wb1ag60mcm56axcrx9pd6hgrsxmqynyplbcfl01ms2i60fhr9";
+  version = "0.7.2.0";
+  sha256 = "826561ecf285abc857bde043e5aac50cb7a7157aaf24fd1aee26a25d4c2a3cbb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +18,4 @@ mkDerivation {
   description = "Dependent sum type";
   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 ea4a61cce734e477bc39dadb10e01a14a17cea4e..8cc640943ceb3d53b433a152db524545d01d29ef 100644
--- a/pkgs/deriving-aeson.nix
+++ b/pkgs/deriving-aeson.nix
@@ -1,10 +1,8 @@
 { mkDerivation, aeson, base, bytestring, lib }:
 mkDerivation {
   pname = "deriving-aeson";
-  version = "0.2.8";
-  sha256 = "2dd3824fbb182811655e7ff9a2292ffc9178a29d0ccdcc0d04ef74c54856a938";
-  revision = "1";
-  editedCabalFile = "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5";
+  version = "0.2.9";
+  sha256 = "c0b2975df7ed5ba668982ba442318c36adfe8be3c32dcf136c13bf9662261833";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +18,4 @@ mkDerivation {
   description = "Type driven generic aeson instance customisation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/deriving-compat.nix b/pkgs/deriving-compat.nix
index 019a6b211f494835bd53a6e8524154b20db08d35..f74d2c8115c022de9eb7a257ff607a5d7fffa4bd 100644
--- a/pkgs/deriving-compat.nix
+++ b/pkgs/deriving-compat.nix
@@ -1,51 +1,22 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, base-orphans
-, containers
-, ghc-boot-th
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, tagged
-, template-haskell
-, th-abstraction
-, transformers
-, transformers-compat
-, void
+{ mkDerivation, QuickCheck, base, base-compat, base-orphans
+, containers, ghc-boot-th, ghc-prim, hspec, hspec-discover, lib
+, tagged, template-haskell, th-abstraction, transformers
+, transformers-compat, void
 }:
 mkDerivation {
   pname = "deriving-compat";
-  version = "0.6.1";
-  sha256 = "6bfda1bb730fdad50251f7875dff2802fea3388cfd4ea232f34a03218cae9d26";
-  revision = "1";
-  editedCabalFile = "0m3ywfvj96yqrdyv6mgnmdhlsvjjn89wl0n1n7v2m60zaan14cgh";
+  version = "0.6.3";
+  sha256 = "b1bf97012db9012a74af4b13cb3454afb7afa1db54c0f6e4bd7c10349e66692a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-boot-th
-    ghc-prim
-    template-haskell
-    th-abstraction
-    transformers
-    transformers-compat
+    base containers ghc-boot-th ghc-prim template-haskell
+    th-abstraction transformers transformers-compat
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    base-orphans
-    hspec
-    QuickCheck
-    tagged
-    template-haskell
-    transformers
-    transformers-compat
-    void
+    base base-compat base-orphans hspec QuickCheck tagged
+    template-haskell transformers transformers-compat void
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -59,4 +30,4 @@ mkDerivation {
   description = "Backports of GHC deriving extensions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-postscript.nix b/pkgs/diagrams-postscript.nix
index 38257dffb69e0c65eda957175c8f9bdce9050501..3d50c4a59b36228411326e4507319412310453ca 100644
--- a/pkgs/diagrams-postscript.nix
+++ b/pkgs/diagrams-postscript.nix
@@ -1,41 +1,17 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, data-default-class
-, diagrams-core
-, diagrams-lib
-, hashable
-, lens
-, lib
-, monoid-extras
-, mtl
-, semigroups
-, split
-, statestack
+{ mkDerivation, base, bytestring, containers, data-default-class
+, diagrams-core, diagrams-lib, hashable, lens, lib, monoid-extras
+, mtl, semigroups, split, statestack
 }:
 mkDerivation {
   pname = "diagrams-postscript";
-  version = "1.5.1";
-  sha256 = "2f7d9e8ec3e42005dbcf7c18c941bdb9e088be0d48dc095a683d5ce3c7d00286";
-  revision = "2";
-  editedCabalFile = "0w662h38pjmxz029ffxzv2cj6hx2mpzzr180m2340phxjflxr07g";
+  version = "1.5.1.1";
+  sha256 = "842afeee6f4895d9b3d49d21118428c1f85594a76fbf89d84b2ee23101088bcf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    data-default-class
-    diagrams-core
-    diagrams-lib
-    hashable
-    lens
-    monoid-extras
-    mtl
-    semigroups
-    split
+    base bytestring containers data-default-class diagrams-core
+    diagrams-lib hashable lens monoid-extras mtl semigroups split
     statestack
   ];
   enableLibraryProfiling = true;
@@ -49,4 +25,4 @@ mkDerivation {
   description = "Postscript backend for diagrams drawing EDSL";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/digest.nix b/pkgs/digest.nix
index 68f8d74755066f1a62502330925ed8737d36285d..6b9c7f146efa4526feb7f8dfc996abcedb5e4314 100644
--- a/pkgs/digest.nix
+++ b/pkgs/digest.nix
@@ -1,13 +1,13 @@
 { mkDerivation, base, bytestring, lib, zlib }:
 mkDerivation {
   pname = "digest";
-  version = "0.0.1.3";
-  sha256 = "5596a53e17c036b9b2aefbed069ec819b36fefcd4bed21330ae0ee5be840a3d0";
+  version = "0.0.1.7";
+  sha256 = "b23d6c804e6fed0ac9bb0d35b7aed5785330d63efebe296cf0073dab17e05f0a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
-  librarySystemDepends = [ zlib ];
+  libraryPkgconfigDepends = [ zlib ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -15,7 +15,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
-  license = lib.licenses.bsd3;
+  description = "Various hashes for bytestrings; CRC32 and Adler32 for now";
+  license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/direct-sqlite.nix b/pkgs/direct-sqlite.nix
index 9cccceb4865d5ad5fc8f03037bb01dbd268fed37..3236458545d9323a1853e9a0ca90901d772977ce 100644
--- a/pkgs/direct-sqlite.nix
+++ b/pkgs/direct-sqlite.nix
@@ -1,29 +1,16 @@
-{ mkDerivation
-, HUnit
-, base
-, base16-bytestring
-, bytestring
-, directory
-, lib
-, temporary
-, text
+{ mkDerivation, HUnit, base, base16-bytestring, bytestring
+, directory, lib, temporary, text
 }:
 mkDerivation {
   pname = "direct-sqlite";
-  version = "2.3.27";
-  sha256 = "0319dd780712859fcacf0b8f1401088f76af3b651c7ec366e0231c15e73bd82e";
+  version = "2.3.28";
+  sha256 = "6744ff6cd66482bdb788a437e8970e27ae971906e52d75b68b3e6be7d03b8a44";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text ];
   testHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    directory
-    HUnit
-    temporary
-    text
+    base base16-bytestring bytestring directory HUnit temporary text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/distribution-nixpkgs.nix b/pkgs/distribution-nixpkgs.nix
index c9e662ee769204cbdcf10b5028d86b9f61774031..26926b0d81558bf298526d7588065dbe97a46da9 100644
--- a/pkgs/distribution-nixpkgs.nix
+++ b/pkgs/distribution-nixpkgs.nix
@@ -1,48 +1,19 @@
-{ mkDerivation
-, Cabal
-, aeson
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, hspec
-, language-nix
-, lens
-, lib
-, pretty
-, process
+{ mkDerivation, Cabal, aeson, base, bytestring, containers, deepseq
+, directory, hspec, language-nix, lens, lib, pretty, process
 }:
 mkDerivation {
   pname = "distribution-nixpkgs";
-  version = "1.7.0";
-  sha256 = "c9f04b175ea93074bea78b508e1e9c44a17f6151cafa375cfdbfe668b08ff900";
-  revision = "1";
-  editedCabalFile = "0xzrh7kfla9c43jjjnd2r13xsp994gdkxkwgav2kl50qxzdb88nx";
+  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
+    aeson base bytestring Cabal containers deepseq language-nix lens
+    pretty process
   ];
   testHaskellDepends = [
-    aeson
-    base
-    Cabal
-    deepseq
-    directory
-    hspec
-    language-nix
-    lens
+    aeson base Cabal deepseq directory hspec language-nix lens
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +26,4 @@ mkDerivation {
   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/doctest-parallel.nix b/pkgs/doctest-parallel.nix
index 93b4afc276b6045d4f9b03cffd5860d7e95429ec..4c5143ef9adf7ed1ddbd070feb55da1ada35ee1d 100644
--- a/pkgs/doctest-parallel.nix
+++ b/pkgs/doctest-parallel.nix
@@ -1,91 +1,26 @@
-{ mkDerivation
-, Cabal
-, Glob
-, HUnit
-, QuickCheck
-, base
-, base-compat
-, code-page
-, containers
-, deepseq
-, directory
-, exceptions
-, extra
-, filepath
-, ghc
-, ghc-paths
-, hspec
-, hspec-core
-, hspec-discover
-, lib
-, mockery
-, pretty
-, process
-, random
-, setenv
-, silently
-, stringbuilder
-, syb
-, template-haskell
-, transformers
-, unordered-containers
+{ 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.2.5";
-  sha256 = "ec63fdcb9b26084a52d8603d39745abfcfa621b6c99be66803d8bd4ba927be1c";
-  revision = "1";
-  editedCabalFile = "1q81qjz9af9a57xyxz6kci28shl4r9y3lrl3rckknhqwcy1ahqz4";
+  version = "0.3.0.1";
+  sha256 = "21a8c51254b9f95420925812b17b759cadff2c05e1580abb7b885028fa745f9d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    Cabal
-    code-page
-    containers
-    deepseq
-    directory
-    exceptions
-    extra
-    filepath
-    ghc
-    ghc-paths
-    Glob
-    pretty
-    process
-    random
-    syb
-    template-haskell
-    transformers
-    unordered-containers
+    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
-    hspec-discover
-    HUnit
-    mockery
-    process
-    QuickCheck
-    setenv
-    silently
-    stringbuilder
-    syb
-    transformers
+    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
   ];
-  testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -97,4 +32,4 @@ mkDerivation {
   description = "Test interactive Haskell examples";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/easy-file.nix b/pkgs/easy-file.nix
index 602dade9ed937f467fa4c7c3ccffef3c0d06d8cf..bdfbfc265b0018d158aca94a671d7e904bd170bc 100644
--- a/pkgs/easy-file.nix
+++ b/pkgs/easy-file.nix
@@ -1,12 +1,15 @@
-{ mkDerivation, base, directory, filepath, lib, time, unix }:
+{ mkDerivation, base, directory, filepath, lib, tasty, tasty-hunit
+, time, unix
+}:
 mkDerivation {
   pname = "easy-file";
-  version = "0.2.2";
-  sha256 = "52f52e72ba48d60935932401c233a72bf45c582871238aecc5a18021ce67b47e";
+  version = "0.2.3";
+  sha256 = "0437d8c2a5efe4bd703f2627495f28092f0256b3d2dab191c9d08a6351074cc9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base directory filepath time unix ];
+  testHaskellDepends = [ base tasty tasty-hunit ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -18,4 +21,4 @@ mkDerivation {
   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 45ed7cd0deb1d3b3a1ed590e6f89abb8096e3aa4..b18fc91905399b1e3cb6f4eab3b308d3b663d940 100644
--- a/pkgs/effectful-core.nix
+++ b/pkgs/effectful-core.nix
@@ -1,28 +1,16 @@
-{ mkDerivation
-, base
-, containers
-, exceptions
-, lib
-, monad-control
-, primitive
-, transformers-base
-, unliftio-core
+{ mkDerivation, base, containers, exceptions, lib, monad-control
+, primitive, transformers-base, unliftio-core
 }:
 mkDerivation {
   pname = "effectful-core";
-  version = "2.1.0.0";
-  sha256 = "93920bb5b58d6c92f51823c95e436a1a35c40fa677ee4f96014267698c43efd1";
+  version = "2.2.2.2";
+  sha256 = "58ed41ac7ffb0dd8ad438433c7a510457df691e4a1009b2077cc58226e667afa";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    exceptions
-    monad-control
-    primitive
-    transformers-base
-    unliftio-core
+    base containers exceptions monad-control primitive
+    transformers-base unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +22,4 @@ mkDerivation {
   description = "An easy to use, performant extensible effects library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/effectful-th.nix b/pkgs/effectful-th.nix
index c96a81a78b5af9bdfe5922d1ddf32dee0c55ff93..c7c471ef15d1758aaa89fae1d06d837c96267b02 100644
--- a/pkgs/effectful-th.nix
+++ b/pkgs/effectful-th.nix
@@ -1,30 +1,20 @@
-{ mkDerivation
-, base
-, containers
-, effectful
-, exceptions
-, lib
-, template-haskell
-, th-abstraction
+{ mkDerivation, base, containers, effectful-core, exceptions, lib
+, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "effectful-th";
-  version = "1.0.0.0";
-  sha256 = "302605bbc2bb8a1b97308d9611faf5e121958b846cbeb9421e2657a902ef7a63";
-  revision = "3";
-  editedCabalFile = "1nqwvgdvqgh4dvkidyaga7jd95p3hn54hy5gwadsvyf9lll4vjck";
+  version = "1.0.0.1";
+  sha256 = "4ee3882a61a876aa3ca1ab3174347d8442688323f20f30a2d48f54fab4dbaba7";
+  revision = "2";
+  editedCabalFile = "15s8yvxf7sbi1vx5ylnrnxc1b694ndmdac0f5bi8v0cg6sjijkzw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    effectful
-    exceptions
-    template-haskell
+    base containers effectful-core exceptions template-haskell
     th-abstraction
   ];
-  testHaskellDepends = [ base effectful ];
+  testHaskellDepends = [ base effectful-core ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -35,4 +25,4 @@ mkDerivation {
   description = "Template Haskell utilities for the effectful library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/effectful.nix b/pkgs/effectful.nix
index 43723421d543334f79fcc1a4e047947a29c47b9a..0e34165e9081384ea5a5f5bb54ff6754d3b572ec 100644
--- a/pkgs/effectful.nix
+++ b/pkgs/effectful.nix
@@ -1,58 +1,24 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, directory
-, effectful-core
-, exceptions
-, lib
-, lifted-base
-, process
-, stm
-, tasty
-, tasty-bench
-, tasty-hunit
-, text
-, time
-, unix
-, unliftio
+{ mkDerivation, async, base, bytestring, containers, directory
+, effectful-core, exceptions, lib, lifted-base, primitive, process
+, stm, tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio
 }:
 mkDerivation {
   pname = "effectful";
-  version = "2.1.0.0";
-  sha256 = "76147d4d761d3267607a5f71c5925cbb2e8ae538aacaf6c6ddd9574eabec739b";
+  version = "2.2.2.0";
+  sha256 = "71098017cb64788960eed1de4a88ec0beb6f610d2a3fe88a023b80531a12d7c8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    directory
-    effectful-core
-    process
-    stm
-    time
+    async base bytestring directory effectful-core process stm time
     unliftio
   ];
   testHaskellDepends = [
-    base
-    containers
-    effectful-core
-    exceptions
-    lifted-base
-    tasty
-    tasty-hunit
-    unliftio
+    base containers effectful-core exceptions lifted-base primitive
+    tasty tasty-hunit unliftio
   ];
   benchmarkHaskellDepends = [
-    async
-    base
-    tasty-bench
-    text
-    unix
-    unliftio
+    async base tasty-bench text unix unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -64,4 +30,4 @@ mkDerivation {
   description = "An easy to use, performant extensible effects library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/email-validate.nix b/pkgs/email-validate.nix
index 28f92a36943a0f7ee663840ed3518f38d6b98c11..8cc06c1deb9eab5cf8e40129cfb601fb10d895f2 100644
--- a/pkgs/email-validate.nix
+++ b/pkgs/email-validate.nix
@@ -1,25 +1,15 @@
-{ mkDerivation
-, QuickCheck
-, attoparsec
-, base
-, bytestring
-, doctest
-, hspec
-, lib
-, template-haskell
+{ mkDerivation, QuickCheck, attoparsec, base, bytestring, doctest
+, hspec, lib, template-haskell
 }:
 mkDerivation {
   pname = "email-validate";
-  version = "2.3.2.16";
-  sha256 = "b8e5f155c1ba78ae25be88858b201d138cd1363519572edd9a13a9d086f023b3";
+  version = "2.3.2.18";
+  sha256 = "97492da27ec2e856b807a6703be5952b15fdc9be855a32a81526e68a8b2f7185";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    template-haskell
+    attoparsec base bytestring template-haskell
   ];
   testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Email address validation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fcf-containers.nix b/pkgs/fcf-containers.nix
index 768fe6461ed2267cd6f0de92aef34d44e35093ef..f6c2ebd6d747cb9cfbb800b4cfbde65ed389f66a 100644
--- a/pkgs/fcf-containers.nix
+++ b/pkgs/fcf-containers.nix
@@ -1,25 +1,19 @@
-{ mkDerivation
-, base
-, doctest
-, first-class-families
-, ghc-prim
-, lib
-, mtl
+{ mkDerivation, base, containers, doctest, first-class-families
+, ghc-prim, lib, mtl, text
 }:
 mkDerivation {
   pname = "fcf-containers";
-  version = "0.7.1";
-  sha256 = "1a8fedce82b6daca5a0ea0e9b1913da3e908db2cea0f6efbfa9f1305d1df6488";
+  version = "0.8.0";
+  sha256 = "48a38cc08cda7c9cba45fa3f0e2d98a668bf7ec3aa329fe872bbe82ebc8eddc8";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base first-class-families ghc-prim mtl ];
+  libraryHaskellDepends = [
+    base containers first-class-families ghc-prim mtl text
+  ];
   executableHaskellDepends = [ base first-class-families ];
   testHaskellDepends = [
-    base
-    doctest
-    first-class-families
-    ghc-prim
+    base containers doctest first-class-families ghc-prim text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +26,4 @@ mkDerivation {
   description = "Data structures and algorithms for first-class-families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/foldl.nix b/pkgs/foldl.nix
index d584dde8197c17f6dcc6fe651bd42ffd05c5c349..6c939d7b956cf3d3257c5036017bd287bd917d48 100644
--- a/pkgs/foldl.nix
+++ b/pkgs/foldl.nix
@@ -1,46 +1,21 @@
-{ mkDerivation
-, base
-, bytestring
-, comonad
-, containers
-, contravariant
-, criterion
-, doctest
-, hashable
-, lib
-, primitive
-, profunctors
-, random
-, semigroupoids
-, text
-, transformers
-, unordered-containers
-, vector
+{ 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.12";
-  sha256 = "4f59360d96fb9ff10861944dd8a89b2448ea2b7dedc376546f4de80125f5c47d";
-  revision = "5";
-  editedCabalFile = "1b97k85zryid7x2ygi92ilv480ahfjn5yf1f4blllwyxn7zgvjv4";
+  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
+    base bytestring comonad containers contravariant hashable primitive
+    profunctors random semigroupoids text transformers
+    unordered-containers vector
   ];
   testHaskellDepends = [ base doctest ];
   benchmarkHaskellDepends = [ base criterion ];
@@ -54,4 +29,4 @@ mkDerivation {
   description = "Composable, streaming, and efficient left folds";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/formatting.nix b/pkgs/formatting.nix
index fb6f84c815a60508c43f5c35fb34e1e54663e0f7..70ce6d9b03b6b668722d82008554226ac476cf6a 100644
--- a/pkgs/formatting.nix
+++ b/pkgs/formatting.nix
@@ -1,46 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, clock
-, criterion
-, double-conversion
-, ghc-prim
-, hspec
-, lib
-, old-locale
-, scientific
-, text
-, time
+{ mkDerivation, QuickCheck, base, clock, criterion
+, double-conversion, hspec, lib, old-locale, scientific, text, time
 , transformers
 }:
 mkDerivation {
   pname = "formatting";
-  version = "7.1.3";
-  sha256 = "8061bbe29278e6b7bb2268b00e1717385643dfa04e7b58b012bd53b342142cef";
-  revision = "2";
-  editedCabalFile = "1i3qkhxqhvqd7mqfdc1mbizw1fin7vp4dwzayc2y0sqcbg7kkns7";
+  version = "7.2.0";
+  sha256 = "c07b18177af614e7e5f32e6fd924f7b35c1b1c219b3491608ee8e7276e706a6d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    clock
-    double-conversion
-    ghc-prim
-    old-locale
-    scientific
-    text
-    time
+    base clock double-conversion old-locale scientific text time
     transformers
   ];
-  testHaskellDepends = [ base ghc-prim hspec scientific text ];
-  benchmarkHaskellDepends = [
-    base
-    criterion
-    ghc-prim
-    QuickCheck
-    text
-  ];
+  testHaskellDepends = [ base hspec scientific text time ];
+  benchmarkHaskellDepends = [ base criterion QuickCheck text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -52,4 +26,4 @@ mkDerivation {
   description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/free.nix b/pkgs/free.nix
index e4d5699d17b2b5ce247d1d76d4eae0d66ac80522..e48a469e5e99029fc380fa91cafc1eda39840eb7 100644
--- a/pkgs/free.nix
+++ b/pkgs/free.nix
@@ -1,42 +1,20 @@
-{ mkDerivation
-, base
-, comonad
-, containers
-, distributive
-, exceptions
-, indexed-traversable
-, lib
-, mtl
-, profunctors
-, semigroupoids
-, template-haskell
-, th-abstraction
-, transformers
-, transformers-base
+{ mkDerivation, base, comonad, containers, distributive, exceptions
+, indexed-traversable, lib, mtl, profunctors, semigroupoids
+, template-haskell, th-abstraction, transformers, transformers-base
 }:
 mkDerivation {
   pname = "free";
-  version = "5.1.9";
-  sha256 = "2e751309408550ebccc2708170ec8473eac1e35b4bc1016bee0776ac938e9fee";
+  version = "5.2";
+  sha256 = "72867f7c89173263765736e8d395e94291f1aaea626ecb1d673d72ce90b94f89";
   revision = "1";
-  editedCabalFile = "133nycxnzy7sgp2vib8hpp2jgzm8pxp31ljf7b4v91jn1gqg3kpl";
+  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
+    base comonad containers distributive exceptions indexed-traversable
+    mtl profunctors semigroupoids template-haskell th-abstraction
+    transformers transformers-base
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +27,4 @@ mkDerivation {
   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 73b58e57726a5a20c45fe959a92661139f5211a3..3b13df6b6ac7280ef9bf121ab405505d04e9eccf 100644
--- a/pkgs/generic-data.nix
+++ b/pkgs/generic-data.nix
@@ -1,42 +1,22 @@
-{ mkDerivation
-, ap-normalize
-, base
-, base-orphans
-, contravariant
-, criterion
-, deepseq
-, generic-lens
-, ghc-boot-th
-, lib
-, one-liner
-, show-combinators
-, tasty
-, tasty-hunit
+{ mkDerivation, ap-normalize, base, base-orphans, contravariant
+, deepseq, generic-lens, ghc-boot-th, lib, one-liner
+, show-combinators, tasty, tasty-bench, tasty-hunit
 }:
 mkDerivation {
   pname = "generic-data";
-  version = "1.0.0.0";
-  sha256 = "0fa021b8d0d879d9f1d81c792bf596ccc88ebdaf94dc0c1d1d3cadcf47eacab1";
+  version = "1.1.0.0";
+  sha256 = "b12cbc4d99b35f3638aa47a5c45a8f1b3b633ac0d2fff24a0c10ec72089bbccb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ap-normalize
-    base
-    base-orphans
-    contravariant
-    ghc-boot-th
+    ap-normalize base base-orphans contravariant ghc-boot-th
     show-combinators
   ];
   testHaskellDepends = [
-    base
-    generic-lens
-    one-liner
-    show-combinators
-    tasty
-    tasty-hunit
+    base generic-lens one-liner show-combinators tasty tasty-hunit
   ];
-  benchmarkHaskellDepends = [ base criterion deepseq ];
+  benchmarkHaskellDepends = [ base deepseq tasty-bench ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -48,4 +28,4 @@ mkDerivation {
   description = "Deriving instances with GHC.Generics and related utilities";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-deriving.nix b/pkgs/generic-deriving.nix
index c9845ad3648183f5a5234934f8d353f3a3cb7819..a7379a312d154901c14569adfd0f9eb8ecc1c0e6 100644
--- a/pkgs/generic-deriving.nix
+++ b/pkgs/generic-deriving.nix
@@ -1,26 +1,15 @@
-{ mkDerivation
-, base
-, containers
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, template-haskell
-, th-abstraction
+{ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
+, lib, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "generic-deriving";
-  version = "1.14.2";
-  sha256 = "265e351117d451afaa37821ce91b44a02611cc94c7ed917a19e1efb0cc63aa2f";
+  version = "1.14.3";
+  sha256 = "9e4fa5082b36685db2e79f34ebc835c30ba9032a9b04673e21089742d28fbc40";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    template-haskell
-    th-abstraction
+    base containers ghc-prim template-haskell th-abstraction
   ];
   testHaskellDepends = [ base hspec template-haskell ];
   testToolDepends = [ hspec-discover ];
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Generic programming library for generalised deriving";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generically.nix b/pkgs/generically.nix
index 733a2cb6b3e2f2ddaf4eca715cf462e49a1a9433..aa94bf6a0f78e5a530dce14ee9e1eb0e6abc285f 100644
--- a/pkgs/generically.nix
+++ b/pkgs/generically.nix
@@ -1,12 +1,14 @@
-{ mkDerivation, base, lib }:
+{ mkDerivation, base, base-orphans, lib }:
 mkDerivation {
   pname = "generically";
-  version = "0.1";
-  sha256 = "d5b72880e1d00b24b6c221978d060bea620acc412cdcb62521f3016cbd3f2b71";
+  version = "0.1.1";
+  sha256 = "04c5a436bec4b041f71a733f56a1bd7f435f63dde8d3eb5c1f48d55b4dbc43cf";
+  revision = "1";
+  editedCabalFile = "0pkyhym7q9v03pplpfjg80vmpk0cbgc56panfx9vcbzadvxmx6rb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base ];
+  libraryHaskellDepends = [ base base-orphans ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -17,4 +19,4 @@ mkDerivation {
   description = "Generically newtype to use with DerivingVia";
   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 c71dec78dd1c49372caf26b2a65097cd8dde24de..eb9004c033664ed8e601a144b35dfd64197fa67f 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.3";
-  sha256 = "e985cda6fc983f703c3ae319e62e1253e25422785ec11992cb3faaaad67480a1";
+  version = "0.4.4";
+  sha256 = "3c21708a6e080a915bf29bf60f1bfde68b516f076cea8a7c5c2683a725efde79";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Utilities for writing GHC type-checker plugins";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-typelits-knownnat.nix b/pkgs/ghc-typelits-knownnat.nix
index 79c620bd583cd922f8fa4106ff8734c88cb2f437..58dd00f23ba1c86b94dcfe9b8bd8ad5f430a7ab7 100644
--- a/pkgs/ghc-typelits-knownnat.nix
+++ b/pkgs/ghc-typelits-knownnat.nix
@@ -1,38 +1,20 @@
-{ mkDerivation
-, base
-, ghc
-, ghc-prim
-, ghc-tcplugins-extra
-, ghc-typelits-natnormalise
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, transformers
+{ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+, ghc-typelits-natnormalise, lib, tasty, tasty-hunit
+, tasty-quickcheck, template-haskell, transformers
 }:
 mkDerivation {
   pname = "ghc-typelits-knownnat";
-  version = "0.7.7";
-  sha256 = "c79018557e88cd1b3937d15d9fb75c4cc7e6b44856ad53b15ae4c421a385f92c";
+  version = "0.7.8";
+  sha256 = "2723ee1dc9024a4a8ddf93dbb6082410fc05deeee7bd975c8ce5d7fed71bea22";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    ghc
-    ghc-prim
-    ghc-tcplugins-extra
-    ghc-typelits-natnormalise
-    template-haskell
-    transformers
+    base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
+    template-haskell transformers
   ];
   testHaskellDepends = [
-    base
-    ghc-typelits-natnormalise
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   description = "Derive KnownNat constraints from other KnownNat constraints";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-typelits-natnormalise.nix b/pkgs/ghc-typelits-natnormalise.nix
index 882a222b20c985de45d610262b8a15320dc4e1d6..b8fab56594e27c2beaaa2130b79ad5f8b9128db6 100644
--- a/pkgs/ghc-typelits-natnormalise.nix
+++ b/pkgs/ghc-typelits-natnormalise.nix
@@ -1,37 +1,19 @@
-{ mkDerivation
-, base
-, containers
-, ghc
-, ghc-bignum
-, ghc-prim
-, ghc-tcplugins-extra
-, lib
-, tasty
-, tasty-hunit
-, template-haskell
+{ mkDerivation, base, containers, ghc, ghc-bignum, ghc-prim
+, ghc-tcplugins-extra, lib, tasty, tasty-hunit, template-haskell
 , transformers
 }:
 mkDerivation {
   pname = "ghc-typelits-natnormalise";
-  version = "0.7.7";
-  sha256 = "90ea374a1d58c1cd6cd3fb156f99873aae90bfb419279ca178372f2287d7175f";
+  version = "0.7.8";
+  sha256 = "d68a0e61ad67f6d267003fe779f43f82152d6eddbc41efd738d6da38cd00de42";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc
-    ghc-bignum
-    ghc-tcplugins-extra
-    transformers
+    base containers ghc ghc-bignum ghc-tcplugins-extra transformers
   ];
   testHaskellDepends = [
-    base
-    ghc-prim
-    tasty
-    tasty-hunit
-    template-haskell
+    base ghc-prim tasty tasty-hunit template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghcide.nix b/pkgs/ghcide.nix
index 72656cae628f64df9f207912e2fe318528c27e36..ce917a39acb190f4e1f933c9f28ba67e4de26fd6 100644
--- a/pkgs/ghcide.nix
+++ b/pkgs/ghcide.nix
@@ -1,208 +1,51 @@
-{ 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
-, hslogger
-, 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, 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, hslogger
+, 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 {
   pname = "ghcide";
-  version = "1.9.0.0";
-  sha256 = "6470de9d388c783e8826c790e7cfe4a7a282a8a1e4d368041bdce4070db4586a";
+  version = "1.9.1.0";
+  sha256 = "49f7e3d15e4701947bba173df256052f04e89ce5889250d6f9a07849ead02de4";
   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
-    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
-    haddock-library
-    hashable
-    hie-bios
-    hie-compat
-    hiedb
-    hls-graph
-    hls-plugin-api
-    hslogger
-    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
+    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 Diff directory
+    dlist enummapset exceptions extra filepath fingertree focus ghc
+    ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob
+    haddock-library hashable hie-bios hie-compat hiedb hls-graph
+    hls-plugin-api hslogger 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
   ];
   executableHaskellDepends = [
-    base
-    data-default
-    extra
-    gitrev
-    hls-plugin-api
-    lsp
-    lsp-types
+    base data-default extra gitrev hls-plugin-api lsp lsp-types
     optparse-applicative
   ];
   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
+    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
   ];
   testToolDepends = [ implicit-hie ];
@@ -217,4 +60,4 @@ mkDerivation {
   description = "The core of an IDE";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hashable.nix b/pkgs/hashable.nix
index f107e41505b721cc9b130cf0fede071a4d40af21..6a1fb4ff4ea1e3eee2ddd4ca0274b30118421ef7 100644
--- a/pkgs/hashable.nix
+++ b/pkgs/hashable.nix
@@ -1,48 +1,24 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, containers
-, deepseq
-, ghc-bignum
-, ghc-prim
-, lib
-, random
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, unix
+{ 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.1.0";
-  sha256 = "e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87";
+  version = "1.4.2.0";
+  sha256 = "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8";
+  revision = "1";
+  editedCabalFile = "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-bignum
-    ghc-prim
+    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
+    base bytestring ghc-prim HUnit QuickCheck random test-framework
+    test-framework-hunit test-framework-quickcheck2 text unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +31,4 @@ mkDerivation {
   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/hashing.nix b/pkgs/hashing.nix
index d9c29aed90ca115bf5734f6afd3a4d780e502bb3..605b1a9d2d9a8849cbca81950dcc299d6acddbb1 100644
--- a/pkgs/hashing.nix
+++ b/pkgs/hashing.nix
@@ -1,38 +1,19 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, cryptonite
-, lib
-, mtl
-, template-haskell
+{ mkDerivation, QuickCheck, array, base, bytestring, cryptonite
+, lib, mtl, template-haskell
 }:
 mkDerivation {
   pname = "hashing";
-  version = "0.1.0.1";
-  sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410";
-  revision = "2";
-  editedCabalFile = "1rwl68jiivw7f2f5cg73sr3dawlbmklnwyiwivrcsihrg4b1z1lq";
+  version = "0.1.1.0";
+  sha256 = "71d9be6f44c1f786b7b28e09acdcb013e4f5ebe953e01bd9752fd54a9bd17ca8";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base bytestring ];
   executableHaskellDepends = [
-    array
-    base
-    bytestring
-    mtl
-    QuickCheck
+    array base bytestring mtl QuickCheck
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    cryptonite
-    mtl
-    QuickCheck
-    template-haskell
+    array base bytestring cryptonite mtl QuickCheck template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +26,4 @@ mkDerivation {
   description = "A pure haskell library implements several hash algorithms";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hashtables.nix b/pkgs/hashtables.nix
index d7bb5929a3d9aaa36b17c6da16679cf81a362d38..c81d10c8e3f1a46587a1a738a6eec1769a1b973b 100644
--- a/pkgs/hashtables.nix
+++ b/pkgs/hashtables.nix
@@ -1,42 +1,20 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, ghc-prim
-, hashable
-, lib
-, mwc-random
-, primitive
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, vector
+{ mkDerivation, HUnit, QuickCheck, base, ghc-prim, hashable, lib
+, mwc-random, primitive, test-framework, test-framework-hunit
+, test-framework-quickcheck2, vector
 }:
 mkDerivation {
   pname = "hashtables";
-  version = "1.3";
-  sha256 = "af785a6d13842ebbd804b0ec174dd957a2591b224434e3ce883f537321f90dd3";
+  version = "1.3.1";
+  sha256 = "6f3d40eb22ab87279b9a0bf51c22307706b240c90a664c82bfae2392268c59c3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    ghc-prim
-    hashable
-    primitive
-    vector
+    base ghc-prim hashable primitive vector
   ];
   testHaskellDepends = [
-    base
-    ghc-prim
-    hashable
-    HUnit
-    mwc-random
-    primitive
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base ghc-prim hashable HUnit mwc-random primitive QuickCheck
+    test-framework test-framework-hunit test-framework-quickcheck2
     vector
   ];
   enableLibraryProfiling = true;
@@ -50,4 +28,4 @@ mkDerivation {
   description = "Mutable hash tables in the ST monad";
   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 478780aa00fc5915387aa7bdac9f5899b5e51b1f..25c82e002494ec5048fa7cb735d57715a9e2a277 100644
--- a/pkgs/haskell-language-server.nix
+++ b/pkgs/haskell-language-server.nix
@@ -1,80 +1,22 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, async
-, base
-, base16-bytestring
-, binary
-, bytestring
-, containers
-, cryptohash-sha1
-, data-default
-, deepseq
-, directory
-, extra
-, filepath
-, ghc
-, ghc-boot-th
-, ghc-paths
-, ghcide
-, ghcide-bench
-, ghcide-test-utils
-, githash
-, gitrev
-, hashable
-, hie-bios
-, hiedb
-, hls-alternate-number-format-plugin
-, hls-cabal-fmt-plugin
-, hls-cabal-plugin
-, hls-call-hierarchy-plugin
-, 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-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
-, hslogger
-, 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
+{ mkDerivation, aeson, aeson-pretty, async, base, base16-bytestring
+, binary, bytestring, containers, cryptohash-sha1, data-default
+, deepseq, directory, extra, filepath, ghc, ghc-boot-th, ghc-paths
+, ghcide, ghcide-bench, ghcide-test-utils, githash, gitrev
+, hashable, hie-bios, hiedb, hls-alternate-number-format-plugin
+, hls-cabal-fmt-plugin, hls-cabal-plugin, hls-call-hierarchy-plugin
+, 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-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, hslogger, 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
 }:
 mkDerivation {
   pname = "haskell-language-server";
@@ -83,153 +25,48 @@ mkDerivation {
   revision = "1";
   editedCabalFile = "19y9wid97a2c6x8cx2zq2r0asr8x0wlnvxmrj9qhfpvmk05sqrpm";
   configureFlags = [
-    "-f-dynamic"
-    "-f-eval"
-    "-f-floskell"
-    "-f-ormolu"
-    "-f-rename"
+    "-f-dynamic" "-f-eval" "-f-floskell" "-f-ormolu" "-f-rename"
     "-f-stylishhaskell"
   ];
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson-pretty
-    async
-    base
-    base16-bytestring
-    bytestring
-    containers
-    cryptohash-sha1
-    data-default
-    directory
-    extra
-    filepath
-    ghc
-    ghcide
-    githash
-    hie-bios
-    hiedb
-    hls-alternate-number-format-plugin
-    hls-cabal-fmt-plugin
-    hls-cabal-plugin
-    hls-call-hierarchy-plugin
-    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-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
+    aeson-pretty async base base16-bytestring bytestring containers
+    cryptohash-sha1 data-default directory extra filepath ghc ghcide
+    githash hie-bios hiedb hls-alternate-number-format-plugin
+    hls-cabal-fmt-plugin hls-cabal-plugin hls-call-hierarchy-plugin
+    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-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
   ];
   executableHaskellDepends = [
-    aeson
-    async
-    base
-    base16-bytestring
-    binary
-    bytestring
-    containers
-    cryptohash-sha1
-    data-default
-    deepseq
-    directory
-    extra
-    filepath
-    ghc
-    ghc-boot-th
-    ghc-paths
-    ghcide
-    gitrev
-    hashable
-    hie-bios
-    hiedb
-    hls-graph
-    hls-plugin-api
-    hslogger
-    lens
-    lsp
-    lsp-types
-    mtl
-    optparse-applicative
-    optparse-simple
-    prettyprinter
-    process
-    regex-tdfa
-    safe-exceptions
-    sqlite-simple
-    stm
-    temporary
-    text
-    transformers
-    unix
-    unliftio-core
-    unordered-containers
+    aeson async base base16-bytestring binary bytestring containers
+    cryptohash-sha1 data-default deepseq directory extra filepath ghc
+    ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb
+    hls-graph hls-plugin-api hslogger lens lsp lsp-types mtl
+    optparse-applicative optparse-simple prettyprinter process
+    regex-tdfa safe-exceptions sqlite-simple stm temporary text
+    transformers unix unliftio-core unordered-containers
   ];
   testHaskellDepends = [
-    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
+    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
     unordered-containers
   ];
   testToolDepends = [ ghcide ];
   benchmarkHaskellDepends = [
-    aeson
-    base
-    containers
-    data-default
-    directory
-    extra
-    filepath
-    ghcide-bench
-    hls-plugin-api
-    lens
-    lens-aeson
-    optparse-applicative
-    shake
-    shake-bench
-    text
-    yaml
+    aeson base containers data-default directory extra filepath
+    ghcide-bench hls-plugin-api lens lens-aeson optparse-applicative
+    shake shake-bench text yaml
   ];
   benchmarkToolDepends = [ ghcide-bench hp2pretty implicit-hie ];
   enableLibraryProfiling = true;
@@ -243,4 +80,4 @@ mkDerivation {
   description = "LSP server for GHC";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/haskell-lexer.nix b/pkgs/haskell-lexer.nix
index b4137f4b275d107e3f2e8897418fbf529f36647c..2e8e413b24dcd0a58f689e758a0829332c54bb21 100644
--- a/pkgs/haskell-lexer.nix
+++ b/pkgs/haskell-lexer.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "haskell-lexer";
-  version = "1.1";
-  sha256 = "313a15cc643322c8badd148867ce25ca1ffc191df9e7eeec5b10bc08c4b563d5";
+  version = "1.1.1";
+  sha256 = "c8eeda569a30f115244c17920247ba2c45d11b3e30805f648a878f7855d8f349";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -16,6 +16,6 @@ mkDerivation {
   hyperlinkSource = false;
   homepage = "https://github.com/yav/haskell-lexer";
   description = "A fully compliant Haskell 98 lexer";
-  license = lib.licenses.bsd3;
+  license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hedgehog-extras.nix b/pkgs/hedgehog-extras.nix
index 05dfab49aa8315c2bf19a9c940c313ace53408b2..eb4f98261bd5da04977dae1dac2971c6a135893b 100644
--- a/pkgs/hedgehog-extras.nix
+++ b/pkgs/hedgehog-extras.nix
@@ -1,62 +1,20 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, async
-, base
-, bytestring
-, deepseq
-, directory
-, exceptions
-, filepath
-, hedgehog
-, hw-aeson
-, lib
-, mmorph
-, mtl
-, network
-, process
-, resourcet
-, stm
-, temporary
-, text
-, time
-, transformers
-, unliftio
-, unordered-containers
-, yaml
+{ mkDerivation, aeson, aeson-pretty, async, base, bytestring
+, deepseq, directory, exceptions, filepath, hedgehog, hw-aeson, lib
+, mmorph, mtl, network, process, resourcet, stm, temporary, text
+, time, transformers, unliftio, unordered-containers, yaml
 }:
 mkDerivation {
   pname = "hedgehog-extras";
-  version = "0.3.0.3";
-  sha256 = "ce307da4bc24f3d7a5ffe0a507f03f4c0b449a524149f8347d169285a68c3fcb";
+  version = "0.4.0.1";
+  sha256 = "43ad73740aea9c4cd5cfbd2c44ed82c022a2d84d02ef70c233bb85e218c45317";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    async
-    base
-    bytestring
-    deepseq
-    directory
-    exceptions
-    filepath
-    hedgehog
-    hw-aeson
-    mmorph
-    mtl
-    network
-    process
-    resourcet
-    stm
-    temporary
-    text
-    time
-    transformers
-    unliftio
-    unordered-containers
-    yaml
+    aeson aeson-pretty async base bytestring deepseq directory
+    exceptions filepath hedgehog hw-aeson mmorph mtl network process
+    resourcet stm temporary text time transformers unliftio
+    unordered-containers yaml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -68,4 +26,4 @@ mkDerivation {
   description = "Supplemental library for hedgehog";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hex-text.nix b/pkgs/hex-text.nix
index a6fcceb96024ea8b3615201cd8db599dfd448a96..c0c5527211d32ae9c6e4dcd347ce0f83eead112d 100644
--- a/pkgs/hex-text.nix
+++ b/pkgs/hex-text.nix
@@ -1,13 +1,17 @@
-{ mkDerivation, base, base16-bytestring, bytestring, lib, text }:
+{ mkDerivation, base, base16-bytestring, bytestring, hspec, lib
+, text
+}:
 mkDerivation {
   pname = "hex-text";
-  version = "0.1.0.7";
-  sha256 = "f60b1668373294f700b720b016e67797bc99b4291bfdac5e357735708ac9def7";
+  version = "0.1.0.8";
+  sha256 = "653924681d94db1e7e8ed9b3be209d17a0fd032683192084d62ee9b6394cf71b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base base16-bytestring bytestring text ];
-  testHaskellDepends = [ base base16-bytestring bytestring text ];
+  testHaskellDepends = [
+    base base16-bytestring bytestring hspec text
+  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -19,4 +23,4 @@ mkDerivation {
   description = "ByteString-Text hexidecimal conversions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hie-bios.nix b/pkgs/hie-bios.nix
index 3722b1203c967f4cfde59867fac0ae279f155afc..8a86659c99bf2d0f557d66d019f8d1891c128513 100644
--- a/pkgs/hie-bios.nix
+++ b/pkgs/hie-bios.nix
@@ -1,36 +1,9 @@
-{ mkDerivation
-, aeson
-, base
-, base16-bytestring
-, bytestring
-, co-log-core
-, conduit
-, conduit-extra
-, containers
-, cryptohash-sha1
-, deepseq
-, directory
-, exceptions
-, extra
-, file-embed
-, filepath
-, ghc
-, lib
-, optparse-applicative
-, prettyprinter
-, process
-, tagged
-, tasty
-, tasty-expected-failure
-, tasty-hunit
-, temporary
-, text
-, time
-, transformers
-, unix-compat
-, unordered-containers
-, vector
-, yaml
+{ mkDerivation, aeson, base, base16-bytestring, bytestring
+, co-log-core, conduit, conduit-extra, containers, cryptohash-sha1
+, deepseq, directory, exceptions, extra, file-embed, filepath, ghc
+, lib, optparse-applicative, prettyprinter, process, tagged, tasty
+, tasty-expected-failure, tasty-hunit, temporary, text, time
+, transformers, unix-compat, unordered-containers, vector, yaml
 }:
 mkDerivation {
   pname = "hie-bios";
@@ -42,58 +15,20 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base16-bytestring
-    bytestring
-    co-log-core
-    conduit
-    conduit-extra
-    containers
-    cryptohash-sha1
-    deepseq
-    directory
-    exceptions
-    extra
-    file-embed
-    filepath
-    ghc
-    prettyprinter
-    process
-    temporary
-    text
-    time
-    transformers
-    unix-compat
-    unordered-containers
-    vector
-    yaml
+    aeson base base16-bytestring bytestring co-log-core conduit
+    conduit-extra containers cryptohash-sha1 deepseq directory
+    exceptions extra file-embed filepath ghc prettyprinter process
+    temporary text time transformers unix-compat unordered-containers
+    vector yaml
   ];
   executableHaskellDepends = [
-    base
-    co-log-core
-    directory
-    filepath
-    ghc
-    optparse-applicative
+    base co-log-core directory filepath ghc optparse-applicative
     prettyprinter
   ];
   testHaskellDepends = [
-    aeson
-    base
-    directory
-    extra
-    filepath
-    ghc
-    tagged
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    temporary
-    text
-    transformers
-    unordered-containers
-    yaml
+    aeson base directory extra filepath ghc tagged tasty
+    tasty-expected-failure tasty-hunit temporary text transformers
+    unordered-containers yaml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -106,4 +41,4 @@ mkDerivation {
   description = "Set up a GHC API session";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hie-compat.nix b/pkgs/hie-compat.nix
index 661d468aa91997f7d9c3d5e596b08732636443b0..242df9039a6aa9d92d71755f8cc531746e905112 100644
--- a/pkgs/hie-compat.nix
+++ b/pkgs/hie-compat.nix
@@ -1,31 +1,17 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, directory
-, filepath
-, ghc
-, ghc-boot
-, lib
-, transformers
+{ mkDerivation, array, base, bytestring, containers, directory
+, filepath, ghc, ghc-boot, lib, transformers
 }:
 mkDerivation {
   pname = "hie-compat";
-  version = "0.3.0.0";
-  sha256 = "ab02e969106971f7ef980515f802447c579c088b2e227eb8982999605f392199";
+  version = "0.3.1.0";
+  sha256 = "e1e8a54273ceb50f71ab329c60d3a2cf70e03431bdbf1056970a95845c0fb347";
+  revision = "1";
+  editedCabalFile = "1dr9cqqmxq6dwsdbmm7q4a26ghsnq66yl49wy54dpyln5xzz4234";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    directory
-    filepath
-    ghc
-    ghc-boot
+    array base bytestring containers directory filepath ghc ghc-boot
     transformers
   ];
   enableLibraryProfiling = true;
@@ -36,7 +22,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://github.com/haskell/haskell-language-server/tree/master/hie-compat#readme";
-  description = "HIE files for GHC 8.6 and other HIE file backports";
+  description = "HIE files for GHC 8.8 and other HIE file backports";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hledger-lib.nix b/pkgs/hledger-lib.nix
index 622ddbd6eb860e93b8d4c96bda348867707a1863..3eaa2d901ba7ab56ad74f557afab683b127a2ab6 100644
--- a/pkgs/hledger-lib.nix
+++ b/pkgs/hledger-lib.nix
@@ -1,144 +1,39 @@
-{ mkDerivation
-, Decimal
-, Glob
-, aeson
-, aeson-pretty
-, ansi-terminal
-, array
-, base
-, blaze-markup
-, breakpoint
-, bytestring
-, call-stack
-, cassava
-, cassava-megaparsec
-, cmdargs
-, containers
-, data-default
-, deepseq
-, directory
-, doclayout
-, doctest
-, extra
-, file-embed
-, filepath
-, hashtables
-, lib
-, megaparsec
-, microlens
-, microlens-th
-, mtl
-, parser-combinators
-, pretty-simple
-, regex-tdfa
-, safe
-, tabular
-, tasty
-, tasty-hunit
-, template-haskell
-, text
-, time
-, timeit
-, transformers
-, uglymemo
-, unordered-containers
-, utf8-string
+{ 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.27.1";
-  sha256 = "0bf2ab283435a3c49b91a2f18e124f7b27d8203a4db6ef8a1df71ae6fcb55270";
+  version = "1.29.1";
+  sha256 = "cc20a32cad515ac87d48d1e4647525353089f41e163ce6675085e57a8f52c9a2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    array
-    base
-    blaze-markup
-    breakpoint
-    bytestring
-    call-stack
-    cassava
-    cassava-megaparsec
-    cmdargs
-    containers
-    data-default
-    Decimal
-    deepseq
-    directory
-    doclayout
-    extra
-    file-embed
-    filepath
-    Glob
-    hashtables
-    megaparsec
-    microlens
-    microlens-th
-    mtl
-    parser-combinators
-    pretty-simple
-    regex-tdfa
-    safe
-    tabular
-    tasty
-    tasty-hunit
-    template-haskell
-    text
-    time
-    timeit
-    transformers
-    uglymemo
-    unordered-containers
+    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
-    blaze-markup
-    breakpoint
-    bytestring
-    call-stack
-    cassava
-    cassava-megaparsec
-    cmdargs
-    containers
-    data-default
-    Decimal
-    deepseq
-    directory
-    doclayout
-    doctest
-    extra
-    file-embed
-    filepath
-    Glob
-    hashtables
-    megaparsec
-    microlens
-    microlens-th
-    mtl
-    parser-combinators
-    pretty-simple
-    regex-tdfa
-    safe
-    tabular
-    tasty
-    tasty-hunit
-    template-haskell
-    text
-    time
-    timeit
-    transformers
-    uglymemo
-    unordered-containers
-    utf8-string
+    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;
@@ -151,4 +46,4 @@ mkDerivation {
   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
index 18d64759cfb3ade736accbd6c6865dc3091dc148..de8d5cb30acf5bfc67a5901c3ba7def5ef418c79 100644
--- a/pkgs/hledger.nix
+++ b/pkgs/hledger.nix
@@ -1,168 +1,41 @@
-{ mkDerivation
-, Decimal
-, Diff
-, aeson
-, ansi-terminal
-, base
-, breakpoint
-, 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
-, time
-, timeit
-, transformers
-, unordered-containers
-, utf8-string
-, utility-ht
-, wizards
+{ 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.27.1";
-  sha256 = "0bb7f637c5dfe0deaf6ea463b68a23fc08c4d581e78a81319e5e687fea41af61";
+  version = "1.29.1";
+  sha256 = "251ee8a7ebfaa3d39bd964a86a4cc9f6edad1b168b7ec392f16f7a4474b2f27f";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    ansi-terminal
-    base
-    breakpoint
-    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
-    time
-    timeit
-    transformers
-    unordered-containers
-    utf8-string
-    utility-ht
-    wizards
+    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
-    breakpoint
-    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
-    time
-    timeit
-    transformers
-    unordered-containers
-    utf8-string
-    utility-ht
-    wizards
+    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
-    breakpoint
-    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
-    time
-    timeit
-    transformers
-    unordered-containers
-    utf8-string
-    utility-ht
-    wizards
+    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;
@@ -175,4 +48,4 @@ mkDerivation {
   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/hls-hlint-plugin.nix b/pkgs/hls-hlint-plugin.nix
index 6eceeeaec6fac14ebb60e09a91406e3e7ba834e6..4ddd862ef4bb0d228760dfd67c88d3af604d32e3 100644
--- a/pkgs/hls-hlint-plugin.nix
+++ b/pkgs/hls-hlint-plugin.nix
@@ -1,85 +1,27 @@
-{ mkDerivation
-, Diff
-, aeson
-, apply-refact
-, base
-, binary
-, bytestring
-, 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
-, hslogger
-, lens
-, lib
-, lsp
-, lsp-types
-, refact
-, regex-tdfa
-, stm
-, temporary
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, Diff, aeson, apply-refact, base, binary, bytestring
+, 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, hslogger, lens
+, lib, lsp, lsp-types, refact, regex-tdfa, stm, temporary, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-hlint-plugin";
-  version = "1.1.1.0";
-  sha256 = "9dda168ebdc68e366636e4730f1d3342134a8e628164254636be7bc1439b2083";
+  version = "1.1.2.0";
+  sha256 = "795cb9fbe79058a9ccf5477276cebf429116dd652d46c3dfbce8fea400b65c9f";
   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
-    hslogger
-    lens
-    lsp
-    refact
-    regex-tdfa
-    stm
-    temporary
-    text
-    transformers
+    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 hslogger
+    lens lsp refact regex-tdfa stm temporary text transformers
     unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    containers
-    filepath
-    hls-plugin-api
-    hls-test-utils
-    lens
-    lsp-types
-    text
+    aeson base containers filepath hls-plugin-api hls-test-utils lens
+    lsp-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -91,4 +33,4 @@ mkDerivation {
   description = "Hlint integration plugin with Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hopenssl.nix b/pkgs/hopenssl.nix
index 86e08ac57d09ef4c71683cf18a6a39621fdfc078..8035315a5a49aedf222ae079615f3c3c4dea6856 100644
--- a/pkgs/hopenssl.nix
+++ b/pkgs/hopenssl.nix
@@ -1,10 +1,8 @@
 { mkDerivation, HUnit, base, bytestring, lib, openssl }:
 mkDerivation {
   pname = "hopenssl";
-  version = "2.2.4";
-  sha256 = "9df46c328fc4c1d1566e2d1539770c9fe9d0422e09ee254721b35ee7d48a7671";
-  revision = "1";
-  editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf";
+  version = "2.2.5";
+  sha256 = "750f9861124b024d3464e05f9527b423f41f24460127a360786d6d441dc103bf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -22,4 +20,4 @@ mkDerivation {
   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/hosc.nix b/pkgs/hosc.nix
index 1775945f50446cb837b2eb6a1f688173dc0669b3..d5591d276584701daa050189159eaf7c5255eaab 100644
--- a/pkgs/hosc.nix
+++ b/pkgs/hosc.nix
@@ -1,30 +1,16 @@
-{ mkDerivation
-, base
-, binary
-, blaze-builder
-, bytestring
-, data-binary-ieee754
-, lib
-, network
-, time
-, transformers
+{ mkDerivation, base, binary, blaze-builder, bytestring
+, data-binary-ieee754, lib, network, parsec, time, transformers
 }:
 mkDerivation {
   pname = "hosc";
-  version = "0.19.1";
-  sha256 = "e713022269060b53ae893c38c0827bb1a19f767dda96e28ee21d4f1d2e0a0223";
+  version = "0.20";
+  sha256 = "e9bb836b9ef1bad7420cb0bc3947514f579d828ab87f750fae9e1cfab2d9fb9e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    binary
-    blaze-builder
-    bytestring
-    data-binary-ieee754
-    network
-    time
-    transformers
+    base binary blaze-builder bytestring data-binary-ieee754 network
+    parsec time transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Haskell Open Sound Control";
   license = lib.licenses.gpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hpack.nix b/pkgs/hpack.nix
index db4fccd22a031cee284ec74780ee52ef84c8ad31..34e7710dfd7e5444141881eba6435e3f34b9f6d4 100644
--- a/pkgs/hpack.nix
+++ b/pkgs/hpack.nix
@@ -1,123 +1,35 @@
-{ 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, 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.0";
-  sha256 = "c6bdbc2d48dac398d3c35120a11455f507639f275befc4fda0a26662db2231b2";
-  revision = "1";
-  editedCabalFile = "1x0rmra2fpfzmhhw090iila2drfdmb1y28ybypmgbi0asa1zl751";
+  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
+    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
+    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
+    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;
@@ -131,4 +43,4 @@ mkDerivation {
   description = "A modern format for Haskell packages";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-aeson.nix b/pkgs/hslua-aeson.nix
index 30b333ffe4757f2ae6d0e507bcc2b9b00b049464..a2e4583e081115c29e444a1f9fa4df61646b38f3 100644
--- a/pkgs/hslua-aeson.nix
+++ b/pkgs/hslua-aeson.nix
@@ -1,60 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, containers
-, hashable
-, hslua-core
-, hslua-marshalling
-, lib
-, mtl
-, quickcheck-instances
-, scientific
-, tasty
-, tasty-quickcheck
-, text
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, aeson, base, bytestring, containers
+, hashable, hslua-core, hslua-marshalling, lib, mtl
+, quickcheck-instances, scientific, tasty, tasty-hunit
+, tasty-quickcheck, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "hslua-aeson";
-  version = "2.2.1";
-  sha256 = "ab221cf59b915fba43deed51514a3703f7b0e504a2e26c6c787cb855bc9af545";
+  version = "2.3.0.1";
+  sha256 = "838adb847538b9fc1d8d61df5cc6fad20564f8098a101a8c8bc167a38fffd5ba";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    hashable
-    hslua-core
-    hslua-marshalling
-    mtl
-    scientific
-    text
-    unordered-containers
-    vector
+    aeson base bytestring containers hashable hslua-core
+    hslua-marshalling mtl scientific text unordered-containers vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    hashable
-    hslua-core
-    hslua-marshalling
-    mtl
-    QuickCheck
-    quickcheck-instances
-    scientific
-    tasty
-    tasty-quickcheck
-    text
-    unordered-containers
-    vector
+    aeson base bytestring containers hashable hslua-core
+    hslua-marshalling mtl QuickCheck quickcheck-instances scientific
+    tasty tasty-hunit tasty-quickcheck text unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -67,4 +30,4 @@ mkDerivation {
   description = "Allow aeson data types to be used with Lua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-classes.nix b/pkgs/hslua-classes.nix
index 149d48fc961a721cc1ac033df9e916e73f0fa832..90eec1e2755dbdf93a7bbe79edb2f5982d31a228 100644
--- a/pkgs/hslua-classes.nix
+++ b/pkgs/hslua-classes.nix
@@ -1,51 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, exceptions
-, hslua-core
-, hslua-marshalling
-, lib
-, lua-arbitrary
-, quickcheck-instances
-, tasty
-, tasty-hslua
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, bytestring, containers
+, exceptions, hslua-core, hslua-marshalling, lib, lua-arbitrary
+, quickcheck-instances, tasty, tasty-hslua, tasty-hunit
+, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "hslua-classes";
-  version = "2.2.0";
-  sha256 = "4145d3929edd4c49f6663102177614e556be81d3c7c9549998266006f9a8fefc";
+  version = "2.3.0";
+  sha256 = "97cd4469764d83dd4410e6493127a49e6f9a9455302ea616d96e289aab2cccd9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-core
-    hslua-marshalling
+    base bytestring containers exceptions hslua-core hslua-marshalling
     text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-core
-    hslua-marshalling
-    lua-arbitrary
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hslua
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring containers exceptions hslua-core hslua-marshalling
+    lua-arbitrary QuickCheck quickcheck-instances tasty tasty-hslua
+    tasty-hunit tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +30,4 @@ mkDerivation {
   description = "Type classes for HsLua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-core.nix b/pkgs/hslua-core.nix
index 3c4c1e2fbb44e0fddd1c5fdaa802a5a517631ef8..2c6a7d4a47c4cf664f171cbe1ea0fe398c06dd58 100644
--- a/pkgs/hslua-core.nix
+++ b/pkgs/hslua-core.nix
@@ -1,46 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, exceptions
-, lib
-, lua
-, lua-arbitrary
-, mtl
-, quickcheck-instances
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, bytestring, exceptions, lib, lua
+, lua-arbitrary, mtl, quickcheck-instances, tasty, tasty-hunit
+, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "hslua-core";
-  version = "2.2.1";
-  sha256 = "78e5e12130fe9ae195e576ed5a391f82f2665b39d377a881640b9064f351c343";
+  version = "2.3.1";
+  sha256 = "1eb218dd9b8791fc113f44c71d42010fa9d5786c2164c35a8b15917c5120afa5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    exceptions
-    lua
-    mtl
-    text
+    base bytestring exceptions lua mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    exceptions
-    lua
-    lua-arbitrary
-    mtl
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring exceptions lua lua-arbitrary mtl QuickCheck
+    quickcheck-instances tasty tasty-hunit tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +27,4 @@ mkDerivation {
   description = "Bindings to Lua, an embeddable scripting language";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-list.nix b/pkgs/hslua-list.nix
new file mode 100644
index 0000000000000000000000000000000000000000..59d378f6f77fe40682c943de5c119e137781e99c
--- /dev/null
+++ b/pkgs/hslua-list.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, base, bytestring, hslua-core, lib, tasty, tasty-lua
+}:
+mkDerivation {
+  pname = "hslua-list";
+  version = "1.1.1";
+  sha256 = "368df8ca23b3f83acf84db5044337d026642b6d99e315f2f46a9e079f7cee05c";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base bytestring hslua-core ];
+  testHaskellDepends = [ base hslua-core tasty tasty-lua ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://hslua.org/";
+  description = "Opinionated, but extensible Lua list type";
+  license = lib.licenses.mit;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/hslua-marshalling.nix b/pkgs/hslua-marshalling.nix
index a9a9b6594b3e4e8a8add567a43931459e70b2d15..5420fe568815ae1f70523dce97cc540db175c32a 100644
--- a/pkgs/hslua-marshalling.nix
+++ b/pkgs/hslua-marshalling.nix
@@ -1,47 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, hslua-core
-, lib
-, lua-arbitrary
-, mtl
-, quickcheck-instances
-, tasty
-, tasty-hslua
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, bytestring, containers
+, hslua-core, lib, lua-arbitrary, mtl, quickcheck-instances, tasty
+, tasty-hslua, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "hslua-marshalling";
-  version = "2.2.1";
-  sha256 = "532b0ff9aaa38583356486e56c4f6c47ad27c0cb50db1cca25db33975de8b1f6";
+  version = "2.3.0";
+  sha256 = "ec01063ae07421325bc0c4427d58d4ffd272d1d38dbcfebae2c3005eaf176510";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    hslua-core
-    mtl
-    text
+    base bytestring containers hslua-core mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    hslua-core
-    lua-arbitrary
-    mtl
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hslua
-    tasty-hunit
-    tasty-quickcheck
+    base bytestring containers hslua-core lua-arbitrary mtl QuickCheck
+    quickcheck-instances tasty tasty-hslua tasty-hunit tasty-quickcheck
     text
   ];
   enableLibraryProfiling = true;
@@ -55,4 +28,4 @@ mkDerivation {
   description = "Marshalling of values between Haskell and Lua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-module-doclayout.nix b/pkgs/hslua-module-doclayout.nix
index 846333cc578024477ca3ed001dfc443958e14763..5213b298b920dc1f013f5a5d9825f9635170db93 100644
--- a/pkgs/hslua-module-doclayout.nix
+++ b/pkgs/hslua-module-doclayout.nix
@@ -1,29 +1,16 @@
-{ mkDerivation
-, base
-, doclayout
-, hslua
-, lib
-, tasty
-, tasty-hunit
-, tasty-lua
-, text
+{ mkDerivation, base, doclayout, hslua, lib, tasty, tasty-hunit
+, tasty-lua, text
 }:
 mkDerivation {
   pname = "hslua-module-doclayout";
-  version = "1.0.4";
-  sha256 = "1843532ca0721a728e38edbdefd1a5f8155b03a1612149e6d919c2cc9e735893";
+  version = "1.1.0";
+  sha256 = "61b204944a74b64ff3d98582071c9ed56778f730e14f29d34a40a3003ff5c4d0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base doclayout hslua text ];
   testHaskellDepends = [
-    base
-    doclayout
-    hslua
-    tasty
-    tasty-hunit
-    tasty-lua
-    text
+    base doclayout hslua tasty tasty-hunit tasty-lua text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   description = "Lua module wrapping Text.DocLayout.";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-module-path.nix b/pkgs/hslua-module-path.nix
index c409b6a01072bebc6f083badd211d9e0b9b3cde8..b14c1d75cca9a5b9428efa9b7ff9bf63c0094773 100644
--- a/pkgs/hslua-module-path.nix
+++ b/pkgs/hslua-module-path.nix
@@ -1,40 +1,19 @@
-{ mkDerivation
-, base
-, filepath
-, hslua-core
-, hslua-marshalling
-, hslua-packaging
-, lib
-, tasty
-, tasty-hunit
-, tasty-lua
-, text
+{ mkDerivation, base, filepath, hslua-core, hslua-marshalling
+, hslua-packaging, lib, tasty, tasty-hunit, tasty-lua, text
 }:
 mkDerivation {
   pname = "hslua-module-path";
-  version = "1.0.3";
-  sha256 = "599bd4f6ce90ebe0a530b607f34dddb3fc4e909269b8b90b7a7318b12a99c2eb";
+  version = "1.1.0";
+  sha256 = "aed5589344ab96879c8dad80785e3de47076126d7f886be8c915ba6adfb187b1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    filepath
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    text
+    base filepath hslua-core hslua-marshalling hslua-packaging text
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    tasty
-    tasty-hunit
-    tasty-lua
-    text
+    base filepath hslua-core hslua-marshalling hslua-packaging tasty
+    tasty-hunit tasty-lua text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Lua module to work with file paths";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-module-system.nix b/pkgs/hslua-module-system.nix
index 77c9aafdb0ac27192b500ba05a4ca45804623a59..46e7eba9d2004a88dd47137d656871428745a38f 100644
--- a/pkgs/hslua-module-system.nix
+++ b/pkgs/hslua-module-system.nix
@@ -1,42 +1,20 @@
-{ mkDerivation
-, base
-, directory
-, exceptions
-, hslua-core
-, hslua-marshalling
-, hslua-packaging
-, lib
-, tasty
-, tasty-hunit
-, tasty-lua
-, temporary
-, text
+{ mkDerivation, base, directory, exceptions, hslua-core
+, hslua-marshalling, hslua-packaging, lib, tasty, tasty-hunit
+, tasty-lua, temporary, text
 }:
 mkDerivation {
   pname = "hslua-module-system";
-  version = "1.0.2";
-  sha256 = "b63593038adb3a09172adfca67e3bc53c5c72de873db325b397994f665724c51";
+  version = "1.1.0";
+  sha256 = "719d43f7da3bac292b42d943706561c02f93d3ed6cde4717dc25ed0a1ff83bcc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    directory
-    exceptions
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    temporary
-    text
+    base directory exceptions hslua-core hslua-marshalling
+    hslua-packaging temporary text
   ];
   testHaskellDepends = [
-    base
-    hslua-core
-    hslua-packaging
-    tasty
-    tasty-hunit
-    tasty-lua
-    text
+    base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +27,4 @@ mkDerivation {
   description = "Lua module wrapper around Haskell's System module";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-module-text.nix b/pkgs/hslua-module-text.nix
index 7e11c960927eea5a53c6165d17c77709d974aae9..4b98b1f89cffb89a46939bcf5b531d50d3a0d12d 100644
--- a/pkgs/hslua-module-text.nix
+++ b/pkgs/hslua-module-text.nix
@@ -1,36 +1,18 @@
-{ mkDerivation
-, base
-, hslua-core
-, hslua-marshalling
-, hslua-packaging
-, lib
-, tasty
-, tasty-hunit
-, tasty-lua
-, text
+{ mkDerivation, base, hslua-core, hslua-marshalling
+, hslua-packaging, lib, tasty, tasty-hunit, tasty-lua, text
 }:
 mkDerivation {
   pname = "hslua-module-text";
-  version = "1.0.2";
-  sha256 = "d81d6525fc1e5d252703f91eb3f015f24adeec057553a4c7696768285fb30577";
+  version = "1.1.0";
+  sha256 = "103349066fb9258ef1a49832f2ea90abbb5a06cada12056774432812461d95cb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    text
+    base hslua-core hslua-marshalling hslua-packaging text
   ];
   testHaskellDepends = [
-    base
-    hslua-core
-    hslua-packaging
-    tasty
-    tasty-hunit
-    tasty-lua
-    text
+    base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +25,4 @@ mkDerivation {
   description = "Lua module for text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-module-version.nix b/pkgs/hslua-module-version.nix
index 24edb24948d9a8017333daa02ba0b4ce3276d9e9..0dd4830d5988ef35430c9f8fb580eb4d73a3fc57 100644
--- a/pkgs/hslua-module-version.nix
+++ b/pkgs/hslua-module-version.nix
@@ -1,40 +1,19 @@
-{ mkDerivation
-, base
-, filepath
-, hslua-core
-, hslua-marshalling
-, hslua-packaging
-, lib
-, tasty
-, tasty-hunit
-, tasty-lua
-, text
+{ mkDerivation, base, filepath, hslua-core, hslua-marshalling
+, hslua-packaging, lib, tasty, tasty-hunit, tasty-lua, text
 }:
 mkDerivation {
   pname = "hslua-module-version";
-  version = "1.0.3";
-  sha256 = "c519b28f5dabf8f0137a3dbb589847bf6a73ad2ea210cc14045feda7d6a244ec";
+  version = "1.1.0";
+  sha256 = "a46bbca58b8ddaba17871ca9787f8ceeaa9f5ae9580cdc41b7b902b33c0f65d8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    filepath
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    text
+    base filepath hslua-core hslua-marshalling hslua-packaging text
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hslua-core
-    hslua-marshalling
-    hslua-packaging
-    tasty
-    tasty-hunit
-    tasty-lua
-    text
+    base filepath hslua-core hslua-marshalling hslua-packaging tasty
+    tasty-hunit tasty-lua text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Lua module to work with version specifiers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-objectorientation.nix b/pkgs/hslua-objectorientation.nix
index ee05f578e634aa452682a5d6f93758ad4660f265..602d95fc18625258ee8df0f406d0f10b0c9fe418 100644
--- a/pkgs/hslua-objectorientation.nix
+++ b/pkgs/hslua-objectorientation.nix
@@ -1,54 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, exceptions
-, hslua-core
-, hslua-marshalling
-, lib
-, lua-arbitrary
-, mtl
-, quickcheck-instances
-, tasty
-, tasty-hslua
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, bytestring, containers
+, exceptions, hslua-core, hslua-marshalling, hslua-typing, lib
+, lua-arbitrary, mtl, quickcheck-instances, tasty, tasty-hslua
+, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "hslua-objectorientation";
-  version = "2.2.1";
-  sha256 = "7e602b93c02f359c8a8061620813f92d3fdcde2b3c59ad9ea02f53f3bf0f018c";
+  version = "2.3.0";
+  sha256 = "4fb51a892d872f0c80f01dcbcdc4fed97602479c631fa67fb90dc04f1900e61d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-core
-    hslua-marshalling
-    mtl
-    text
+    base bytestring containers exceptions hslua-core hslua-marshalling
+    hslua-typing mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-core
-    hslua-marshalling
-    lua-arbitrary
-    mtl
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hslua
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring containers exceptions hslua-core hslua-marshalling
+    hslua-typing lua-arbitrary mtl QuickCheck quickcheck-instances
+    tasty tasty-hslua tasty-hunit tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +30,4 @@ mkDerivation {
   description = "Object orientation tools for HsLua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-packaging.nix b/pkgs/hslua-packaging.nix
index 2a3ddb6006ba4859bbb94e8480399caa1736f373..9c0f56c65d2c38c17b4b2f82a5ec6ff452412a77 100644
--- a/pkgs/hslua-packaging.nix
+++ b/pkgs/hslua-packaging.nix
@@ -1,44 +1,22 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, hslua-core
-, hslua-marshalling
-, hslua-objectorientation
-, lib
-, mtl
-, tasty
-, tasty-hslua
-, tasty-hunit
-, text
+{ mkDerivation, base, bytestring, containers, hslua-core
+, hslua-marshalling, hslua-objectorientation, hslua-typing, lib
+, mtl, tasty, tasty-hslua, tasty-hunit, text
 }:
 mkDerivation {
   pname = "hslua-packaging";
-  version = "2.2.1";
-  sha256 = "2b2a1ffa1b3abfa3a0c20ef261a9125fd051f44c93c2e83c3569e95abbceaefb";
+  version = "2.3.0";
+  sha256 = "21ba53e54c3a8431650ad34cb310974edf14767f927fea58eb3e98794d6b3fcc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    hslua-core
-    hslua-marshalling
-    hslua-objectorientation
-    mtl
-    text
+    base containers hslua-core hslua-marshalling
+    hslua-objectorientation hslua-typing mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    hslua-core
-    hslua-marshalling
-    hslua-objectorientation
-    mtl
-    tasty
-    tasty-hslua
-    tasty-hunit
-    text
+    base bytestring hslua-core hslua-marshalling
+    hslua-objectorientation hslua-typing mtl tasty tasty-hslua
+    tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +29,4 @@ mkDerivation {
   description = "Utilities to build Lua modules";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslua-typing.nix b/pkgs/hslua-typing.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c6e9e3520b4430a29bcaa406df03c4efe816b369
--- /dev/null
+++ b/pkgs/hslua-typing.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, QuickCheck, base, containers, hslua-core
+, hslua-marshalling, lib, lua-arbitrary, quickcheck-instances
+, tasty, tasty-hunit, tasty-quickcheck, text
+}:
+mkDerivation {
+  pname = "hslua-typing";
+  version = "0.1.0";
+  sha256 = "b18740abe3fbe0a2b4bf3cd1e6dda2c080dba097e19a809dff8ffd99095a9002";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    base containers hslua-core hslua-marshalling text
+  ];
+  testHaskellDepends = [
+    base hslua-core hslua-marshalling lua-arbitrary QuickCheck
+    quickcheck-instances tasty tasty-hunit tasty-quickcheck
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://hslua.org/";
+  description = "Type specifiers for Lua";
+  license = lib.licenses.mit;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/hslua.nix b/pkgs/hslua.nix
index 7f1a297bcfe685553db34a346265d3f8ee26aa14..a5e621620041e643e3219d45faa9ff88357c38ba 100644
--- a/pkgs/hslua.nix
+++ b/pkgs/hslua.nix
@@ -1,66 +1,26 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, exceptions
-, hslua-aeson
-, hslua-classes
-, hslua-core
-, hslua-marshalling
-, hslua-objectorientation
-, hslua-packaging
-, lib
-, lua
-, lua-arbitrary
-, mtl
-, quickcheck-instances
-, tasty
-, tasty-hslua
-, tasty-hunit
-, text
+{ mkDerivation, QuickCheck, base, bytestring, containers
+, exceptions, hslua-aeson, hslua-classes, hslua-core
+, hslua-marshalling, hslua-objectorientation, hslua-packaging
+, hslua-typing, lib, lua, lua-arbitrary, mtl, quickcheck-instances
+, tasty, tasty-hslua, tasty-hunit, text
 }:
 mkDerivation {
   pname = "hslua";
-  version = "2.2.1";
-  sha256 = "63cf9d92e90aadfd2887196428fa625e8b2c9b51b942188ed33289c5253ba8e0";
+  version = "2.3.0";
+  sha256 = "4fc16b45f012c991717407bf17b50e8240467b76e1f404933addb96df19087b3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-aeson
-    hslua-classes
-    hslua-core
-    hslua-marshalling
-    hslua-objectorientation
-    hslua-packaging
-    mtl
-    text
+    base bytestring containers exceptions hslua-aeson hslua-classes
+    hslua-core hslua-marshalling hslua-objectorientation
+    hslua-packaging hslua-typing mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua-aeson
-    hslua-classes
-    hslua-core
-    hslua-marshalling
-    hslua-objectorientation
-    hslua-packaging
-    lua
-    lua-arbitrary
-    mtl
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hslua
-    tasty-hunit
-    text
+    base bytestring containers exceptions hslua-aeson hslua-classes
+    hslua-core hslua-marshalling hslua-objectorientation
+    hslua-packaging hslua-typing lua lua-arbitrary mtl QuickCheck
+    quickcheck-instances tasty tasty-hslua tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -73,4 +33,4 @@ mkDerivation {
   description = "Bindings to Lua, an embeddable scripting language";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-attoparsec.nix b/pkgs/hspec-attoparsec.nix
index 0d85eb35fdb9046e49469cfa0d031924722bd915..8d7667044220d1f3b495fa815c388299ddaf728e 100644
--- a/pkgs/hspec-attoparsec.nix
+++ b/pkgs/hspec-attoparsec.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, attoparsec
-, base
-, bytestring
-, hspec
-, hspec-expectations
-, lib
-, text
+{ mkDerivation, attoparsec, base, bytestring, hspec
+, hspec-expectations, lib, text
 }:
 mkDerivation {
   pname = "hspec-attoparsec";
@@ -15,19 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    hspec-expectations
-    text
+    attoparsec base bytestring hspec-expectations text
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    hspec
-    hspec-expectations
-    text
+    attoparsec base bytestring hspec hspec-expectations text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +25,4 @@ mkDerivation {
   description = "Utility functions for testing your attoparsec parsers with hspec";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-contrib.nix b/pkgs/hspec-contrib.nix
index 59869911e422c4ec2e5e9655d91087d168844674..30cac4950330f7a230803e4e384e478eba747c0d 100644
--- a/pkgs/hspec-contrib.nix
+++ b/pkgs/hspec-contrib.nix
@@ -1,21 +1,17 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, hspec
-, hspec-core
-, hspec-discover
-, lib
+{ mkDerivation, HUnit, QuickCheck, base, call-stack, hspec
+, hspec-core, hspec-discover, lib
 }:
 mkDerivation {
   pname = "hspec-contrib";
-  version = "0.5.1.1";
-  sha256 = "fde656a694dafbb8e147c1ca41eff5eef6a273f79fbae1bc0722e128852dcbdb";
+  version = "0.5.2";
+  sha256 = "60898e870dce67c7b206015c7d77d7e5ae4c9d256d0c1f1c8f201de8f7ef0200";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base hspec-core HUnit ];
-  testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
+  libraryHaskellDepends = [ base call-stack hspec-core HUnit ];
+  testHaskellDepends = [
+    base call-stack hspec hspec-core HUnit QuickCheck
+  ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -24,8 +20,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://hspec.github.io/";
+  homepage = "https://hspec.github.io/";
   description = "Contributed functionality for Hspec";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-core.nix b/pkgs/hspec-core.nix
index 2063f81893880559dc3c6479fcbe7a7eef303009..9b899c88f977e5544226b0759493da2ab5891f0c 100644
--- a/pkgs/hspec-core.nix
+++ b/pkgs/hspec-core.nix
@@ -1,83 +1,26 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, ansi-terminal
-, array
-, base
-, base-orphans
-, call-stack
-, clock
-, deepseq
-, directory
-, filepath
-, ghc
-, ghc-boot-th
-, hspec-expectations
-, hspec-meta
-, lib
-, process
-, quickcheck-io
-, random
-, setenv
-, silently
-, stm
-, temporary
-, tf-random
-, transformers
+{ 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.0.1";
-  sha256 = "144b16e45019c910c857cf4c6815a1f928ded861fc7047d64e1809dd2695a93c";
+  version = "2.10.10";
+  sha256 = "644793717f2f9ee7f778e2f801ea54705bdd0abb71d7a7e40aa75bd98b8f55b6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    array
-    base
-    call-stack
-    clock
-    deepseq
-    directory
-    filepath
-    ghc
-    ghc-boot-th
-    hspec-expectations
-    HUnit
-    QuickCheck
-    quickcheck-io
-    random
-    setenv
-    stm
-    tf-random
-    transformers
+    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
-    clock
-    deepseq
-    directory
-    filepath
-    ghc
-    ghc-boot-th
-    hspec-expectations
-    hspec-meta
-    HUnit
-    process
-    QuickCheck
-    quickcheck-io
-    random
-    setenv
-    silently
-    stm
-    temporary
-    tf-random
-    transformers
+    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;
@@ -88,8 +31,8 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-  homepage = "http://hspec.github.io/";
+  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
index 446341209643202734cf54d4bb41e2623a283e5d..60120a25efeaf20e05f1ea9d61f5916d88890dab 100644
--- a/pkgs/hspec-discover.nix
+++ b/pkgs/hspec-discover.nix
@@ -1,28 +1,17 @@
-{ mkDerivation
-, QuickCheck
-, base
-, directory
-, filepath
-, hspec-meta
-, lib
-, mockery
+{ mkDerivation, QuickCheck, base, directory, filepath, hspec-meta
+, lib, mockery
 }:
 mkDerivation {
   pname = "hspec-discover";
-  version = "2.10.0.1";
-  sha256 = "3f55defbe8d5493ff73ffdf84cbe8550fbb44d73f796ab31b5387a4c128047fc";
+  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
+    base directory filepath hspec-meta mockery QuickCheck
   ];
   testToolDepends = [ hspec-meta ];
   enableLibraryProfiling = true;
@@ -32,8 +21,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://hspec.github.io/";
+  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-lifted.nix b/pkgs/hspec-expectations-lifted.nix
index 0d62694508b8906145d72949aba73faf85edb44e..4610d069bea3e4d060b3af1e24f48caa03f4709f 100644
--- a/pkgs/hspec-expectations-lifted.nix
+++ b/pkgs/hspec-expectations-lifted.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A version of hspec-expectations generalized to MonadIO";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-expectations.nix b/pkgs/hspec-expectations.nix
index cbbefdcc0371d44496a18628b572fc1e15f1dc5a..7cd9023183efd858baa72846581e75bc3b764f4c 100644
--- a/pkgs/hspec-expectations.nix
+++ b/pkgs/hspec-expectations.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Catchy combinators for HUnit";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-golden-aeson.nix b/pkgs/hspec-golden-aeson.nix
index 8df558b854f9108ae0ec341ba1bbec91d44a7ea8..157b66a4b85828c8b2cfafd1ad16a702399929ef 100644
--- a/pkgs/hspec-golden-aeson.nix
+++ b/pkgs/hspec-golden-aeson.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, aeson-pretty
-, base
-, bytestring
-, directory
-, filepath
-, hspec
-, hspec-core
-, lib
-, quickcheck-arbitrary-adt
-, random
-, silently
-, transformers
+{ mkDerivation, HUnit, QuickCheck, aeson, aeson-pretty, base
+, bytestring, directory, filepath, hspec, hspec-core, lib
+, quickcheck-arbitrary-adt, random, silently, transformers
 }:
 mkDerivation {
   pname = "hspec-golden-aeson";
@@ -23,29 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    directory
-    filepath
-    hspec
-    HUnit
-    QuickCheck
-    quickcheck-arbitrary-adt
-    random
-    transformers
+    aeson aeson-pretty base bytestring directory filepath hspec HUnit
+    QuickCheck quickcheck-arbitrary-adt random transformers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    directory
-    hspec
-    hspec-core
-    QuickCheck
-    quickcheck-arbitrary-adt
-    silently
-    transformers
+    aeson base directory hspec hspec-core QuickCheck
+    quickcheck-arbitrary-adt silently transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +28,4 @@ mkDerivation {
   description = "Use tests to monitor changes in Aeson serialization";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-golden.nix b/pkgs/hspec-golden.nix
index c06488088a8004ab38e69558bf7931a750b92dce..896840fad6dc43ee010dcee8ad0ccce4837dd55a 100644
--- a/pkgs/hspec-golden.nix
+++ b/pkgs/hspec-golden.nix
@@ -1,23 +1,17 @@
-{ mkDerivation
-, base
-, directory
-, filepath
-, hspec
-, hspec-core
-, lib
-, optparse-applicative
-, silently
+{ mkDerivation, base, directory, filepath, hspec, hspec-core
+, hspec-discover, lib, optparse-applicative, silently
 }:
 mkDerivation {
   pname = "hspec-golden";
-  version = "0.2.0.0";
-  sha256 = "d322dd7d625dd3f1c5fd30e7965be127744bfa0f6b337983352f44d1c771e969";
+  version = "0.2.0.1";
+  sha256 = "bc64db188b166235d92a3d42efc6c29a41535fda41830cbb03b7e5b9d75d8725";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base directory filepath hspec-core ];
   executableHaskellDepends = [ base directory optparse-applicative ];
   testHaskellDepends = [ base directory hspec hspec-core silently ];
+  testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -29,4 +23,4 @@ mkDerivation {
   description = "Golden tests for hspec";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-hedgehog.nix b/pkgs/hspec-hedgehog.nix
index 77d9482ddeeb8a4c4669175c53d93c3405e4bec3..600fb051591e869847a737d948c724e2d6adb2e2 100644
--- a/pkgs/hspec-hedgehog.nix
+++ b/pkgs/hspec-hedgehog.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, hedgehog
-, hspec
-, hspec-core
-, lib
-, splitmix
+{ mkDerivation, HUnit, QuickCheck, base, hedgehog, hspec
+, hspec-core, lib, splitmix
 }:
 mkDerivation {
   pname = "hspec-hedgehog";
@@ -18,13 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hedgehog
-    hspec
-    hspec-core
-    HUnit
-    QuickCheck
-    splitmix
+    base hedgehog hspec hspec-core HUnit QuickCheck splitmix
   ];
   testHaskellDepends = [ base hedgehog hspec ];
   enableLibraryProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "Integrate Hedgehog and Hspec!";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-megaparsec.nix b/pkgs/hspec-megaparsec.nix
index 144a946e187c27ab508dc61d8829fcbae89c7f1f..273bcf75a23c69ccfb5812f0d8148d0e06ccecef 100644
--- a/pkgs/hspec-megaparsec.nix
+++ b/pkgs/hspec-megaparsec.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, hspec
-, hspec-expectations
-, lib
+{ mkDerivation, base, containers, hspec, hspec-expectations, lib
 , megaparsec
 }:
 mkDerivation {
@@ -14,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    hspec-expectations
-    megaparsec
+    base containers hspec-expectations megaparsec
   ];
   testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
   enableLibraryProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Utility functions for testing Megaparsec parsers with Hspec";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec-meta.nix b/pkgs/hspec-meta.nix
index 21e56e0a297727de9bff9a11d24432bd459074d2..406afb4994c95dd107a6ddef6aa8086351de90da 100644
--- a/pkgs/hspec-meta.nix
+++ b/pkgs/hspec-meta.nix
@@ -1,66 +1,23 @@
-{ 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, 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.9.3";
-  sha256 = "d546154ac439c445d0d8a70f0977b7332ed8bc325cd902451f544656f5e55de5";
+  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
+    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
+    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;
@@ -73,4 +30,4 @@ mkDerivation {
   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
index 0e94f97bb7126892c591314eabd68c277b5a0798..8c966b009eab5b4294fbbc0995bacaff120f7684 100644
--- a/pkgs/hspec-smallcheck.nix
+++ b/pkgs/hspec-smallcheck.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, base-orphans
-, call-stack
-, hspec
-, hspec-core
-, hspec-discover
-, lib
-, smallcheck
+{ mkDerivation, HUnit, QuickCheck, base, base-orphans, call-stack
+, hspec, hspec-core, hspec-discover, lib, smallcheck
 }:
 mkDerivation {
   pname = "hspec-smallcheck";
@@ -18,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    call-stack
-    hspec-core
-    HUnit
-    smallcheck
+    base call-stack hspec-core HUnit smallcheck
   ];
   testHaskellDepends = [
-    base
-    base-orphans
-    call-stack
-    hspec
-    hspec-core
-    HUnit
-    QuickCheck
+    base base-orphans call-stack hspec hspec-core HUnit QuickCheck
     smallcheck
   ];
   testToolDepends = [ hspec-discover ];
@@ -46,4 +27,4 @@ mkDerivation {
   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-wai.nix b/pkgs/hspec-wai.nix
index 15cd879c4060f5d704cecb59e25a59330c584c0a..e698a05d30c6d65513b4f72bdeaebf4330c25c9c 100644
--- a/pkgs/hspec-wai.nix
+++ b/pkgs/hspec-wai.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, bytestring
-, case-insensitive
-, hspec
-, hspec-core
-, hspec-expectations
-, http-types
-, lib
-, text
-, transformers
-, wai
-, wai-extra
+{ mkDerivation, QuickCheck, base, base-compat, bytestring
+, case-insensitive, hspec, hspec-core, hspec-expectations
+, http-types, lib, text, transformers, wai, wai-extra
 }:
 mkDerivation {
   pname = "hspec-wai";
@@ -22,32 +10,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    case-insensitive
-    hspec-core
-    hspec-expectations
-    http-types
-    QuickCheck
-    text
-    transformers
-    wai
+    base base-compat bytestring case-insensitive hspec-core
+    hspec-expectations http-types QuickCheck text transformers wai
     wai-extra
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    case-insensitive
-    hspec
-    hspec-core
-    hspec-expectations
-    http-types
-    QuickCheck
-    text
-    transformers
-    wai
+    base base-compat bytestring case-insensitive hspec hspec-core
+    hspec-expectations http-types QuickCheck text transformers wai
     wai-extra
   ];
   enableLibraryProfiling = true;
@@ -61,4 +30,4 @@ mkDerivation {
   description = "Experimental Hspec support for testing WAI applications";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hspec.nix b/pkgs/hspec.nix
index 7ab2ff5c685c30efaa91e33ec9f4dbb29ff3908e..788f62dee2d95473f04ad443bbedb4c430828150 100644
--- a/pkgs/hspec.nix
+++ b/pkgs/hspec.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec-core
-, hspec-discover
-, hspec-expectations
-, lib
+{ mkDerivation, QuickCheck, base, hspec-core, hspec-discover
+, hspec-expectations, lib
 }:
 mkDerivation {
   pname = "hspec";
-  version = "2.10.3";
-  sha256 = "e381944a27b5e736e514264f534218268785bcf8177d27126c68780fd9df07f2";
+  version = "2.10.10";
+  sha256 = "9a4b5e63d51796d5f6c3590b8495a1cd8c600e1bf720086b6709ee00405d03a4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hspec-core
-    hspec-discover
-    hspec-expectations
-    QuickCheck
+    base hspec-core hspec-discover hspec-expectations QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -27,8 +18,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://hspec.github.io/";
+  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/http2.nix b/pkgs/http2.nix
index 6c80f6371a46d8b57146f8c3c4fb3ce8eeab786b..69348b2c456cd71054a7cd2ec71755753395da34 100644
--- a/pkgs/http2.nix
+++ b/pkgs/http2.nix
@@ -1,92 +1,32 @@
-{ mkDerivation
-, Glob
-, aeson
-, aeson-pretty
-, array
-, async
-, base
-, base16-bytestring
-, bytestring
-, case-insensitive
-, containers
-, cryptonite
-, directory
-, filepath
-, gauge
-, heaps
-, hspec
-, hspec-discover
-, http-types
-, lib
-, mwc-random
-, network
-, network-byte-order
-, network-run
-, psqueues
-, stm
-, text
-, time-manager
-, typed-process
-, unix-time
-, unordered-containers
-, vector
+{ 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 = "3.0.3";
-  sha256 = "1bae426d9b9c7266b89ae13b8ad7dfb548d16efe4c4dda6c0fa35b7b474c69cf";
+  version = "4.1.0";
+  sha256 = "6da8bbdab1c82a3c005c6aceff2d8b0d2e715e55c059dcc4ba61ce14da8e1d4d";
   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
+    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
+    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
-    heaps
-    mwc-random
-    network-byte-order
-    psqueues
-    stm
+    array base bytestring case-insensitive containers gauge
+    network-byte-order stm
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -99,4 +39,4 @@ mkDerivation {
   description = "HTTP/2 library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/implicit-hie-cradle.nix b/pkgs/implicit-hie-cradle.nix
index 5817d17f91f212b5c2938e1d8b8b242059565640..f7a383c75c12a9b8dddf3b337d02fbdfdaed52c1 100644
--- a/pkgs/implicit-hie-cradle.nix
+++ b/pkgs/implicit-hie-cradle.nix
@@ -1,54 +1,16 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, bytestring
-, containers
-, directory
-, extra
-, filepath
-, hie-bios
-, hslogger
-, implicit-hie
-, lib
-, process
-, temporary
-, text
-, time
-, transformers
-, unix-compat
-, unordered-containers
-, vector
-, yaml
+{ mkDerivation, base, directory, extra, filepath, hie-bios
+, implicit-hie, lib, process, transformers
 }:
 mkDerivation {
   pname = "implicit-hie-cradle";
-  version = "0.5.0.0";
-  sha256 = "3e6a8958052b95665932ed6f951e9e4c30c016b3f8aba1b7d7735f0a188ecc31";
-  revision = "1";
-  editedCabalFile = "0naa4dk7bgg8icx5xy38jpg7gxx9pirqz4gx0ggj5g2r787zcxj2";
+  version = "0.5.0.1";
+  sha256 = "ee5623f8476e01c83dee8acbe5df4049613a5ff6b1831b00eec406c12785cae7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    containers
-    directory
-    extra
-    filepath
-    hie-bios
-    hslogger
-    implicit-hie
-    process
-    temporary
-    text
-    time
+    base directory extra filepath hie-bios implicit-hie process
     transformers
-    unix-compat
-    unordered-containers
-    vector
-    yaml
   ];
   testHaskellDepends = [ base ];
   enableLibraryProfiling = true;
@@ -62,4 +24,4 @@ mkDerivation {
   description = "Auto generate hie-bios cradles";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/incipit-base.nix b/pkgs/incipit-base.nix
index 401cd0d86fc1e68290b8669349bab9c8478065d4..cfae3d3bc3b3fdb03673756fef2962c25e98bcf7 100644
--- a/pkgs/incipit-base.nix
+++ b/pkgs/incipit-base.nix
@@ -1,26 +1,15 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, data-default
-, lib
-, stm
-, text
+{ mkDerivation, base, bytestring, containers, data-default, lib
+, stm, text
 }:
 mkDerivation {
   pname = "incipit-base";
-  version = "0.3.0.0";
-  sha256 = "d12c13e0bd90276ec71595df68368cbbdaaf58ba79a171c805ec2285413ee41a";
+  version = "0.5.0.0";
+  sha256 = "40429f0615920f9251f63e2b37556fa013d70e9ab327323c4b8281d597aa75c0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    data-default
-    stm
-    text
+    base bytestring containers data-default stm text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "A Prelude for Polysemy – Base Reexports";
   license = "BSD-2-Clause-Patent";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/incipit-core.nix b/pkgs/incipit-core.nix
index fd5c4c3671da467eeb999daa4450dbf8ef985f30..1a8fddfeeca3e5789d9212b57650d527e726410b 100644
--- a/pkgs/incipit-core.nix
+++ b/pkgs/incipit-core.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, incipit-base, lib, polysemy }:
 mkDerivation {
   pname = "incipit-core";
-  version = "0.3.0.0";
-  sha256 = "1f6b16d4252ba229c69dfd56450d8b252a8bf2e69c739a565b0d9dbee66f1a3f";
+  version = "0.5.0.0";
+  sha256 = "d2b3a6cef9b87f0aedb37af6e1257959b109d382a93a19cd88d609b1c56dcb9d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A Prelude for Polysemy";
   license = "BSD-2-Clause-Patent";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/indexed-traversable-instances.nix b/pkgs/indexed-traversable-instances.nix
index e94fde23644ee6dcf333594ba1fac517dd14d41a..20d8ec79b7a7c4c69d874337ee4e01aec761ad8f 100644
--- a/pkgs/indexed-traversable-instances.nix
+++ b/pkgs/indexed-traversable-instances.nix
@@ -1,45 +1,24 @@
-{ mkDerivation
-, OneTuple
-, QuickCheck
-, base
-, containers
-, indexed-traversable
-, lib
-, quickcheck-instances
-, tagged
-, tasty
-, tasty-quickcheck
-, transformers
-, unordered-containers
-, vector
+{ 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.1";
-  sha256 = "895ee5063d59e2b58930ca6fa54885bb11f19c8b7c7ba6c7b014f9431cdcc0b0";
+  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
+    base indexed-traversable OneTuple tagged unordered-containers
     vector
   ];
   testHaskellDepends = [
-    base
-    containers
-    indexed-traversable
-    OneTuple
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    transformers
-    unordered-containers
-    vector
+    base containers indexed-traversable OneTuple QuickCheck
+    quickcheck-instances tasty tasty-quickcheck transformers
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +30,4 @@ mkDerivation {
   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
index 0330f3772fcf87690fdaee4d65b5dd06710dac34..55048b250967bf58e37bbf36589f3a473ccdf668 100644
--- a/pkgs/indexed-traversable.nix
+++ b/pkgs/indexed-traversable.nix
@@ -1,10 +1,8 @@
 { mkDerivation, array, base, containers, lib, transformers }:
 mkDerivation {
   pname = "indexed-traversable";
-  version = "0.1.2";
-  sha256 = "516858ee7198b1fed1b93c665157f9855fd947379db7f115d48c1b0d670e698d";
-  revision = "2";
-  editedCabalFile = "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj";
+  version = "0.1.2.1";
+  sha256 = "fe854c10285debc7d6fe3e09da0928a740ebc091ad2911ae695bb007e6f746a4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +17,4 @@ mkDerivation {
   description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/inspection-testing.nix b/pkgs/inspection-testing.nix
index adee4e7b4132cf09bae865e4ef944104e9fd55a1..fd3bf76c5442ae92a6daa58313680f2e45e102e2 100644
--- a/pkgs/inspection-testing.nix
+++ b/pkgs/inspection-testing.nix
@@ -1,26 +1,15 @@
-{ mkDerivation
-, base
-, containers
-, ghc
-, lib
-, mtl
-, template-haskell
+{ mkDerivation, base, containers, ghc, lib, mtl, template-haskell
 , transformers
 }:
 mkDerivation {
   pname = "inspection-testing";
-  version = "0.5";
-  sha256 = "b071b714006f7980a2d71ff8bf24cf33289e334a540f4e3121fcb094a6dd5cc5";
+  version = "0.5.0.1";
+  sha256 = "29750b73c578346659c89a146436e2f582fb0f28d1292b8cf0631873278b077f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc
-    mtl
-    template-haskell
-    transformers
+    base containers ghc mtl template-haskell transformers
   ];
   testHaskellDepends = [ base ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "GHC plugin to do inspection testing";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/invariant.nix b/pkgs/invariant.nix
index 6ac24b8fa4aa982db43e9cf2b1ba2289c1895892..37d1b2aec67a0696b5081197b9f5d8736d9db14d 100644
--- a/pkgs/invariant.nix
+++ b/pkgs/invariant.nix
@@ -1,51 +1,20 @@
-{ 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
+{ 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";
-  sha256 = "b52b2a798c514e2f3bb37d9d629078f433745fa8a25756198c4d33751d7bce1d";
-  revision = "1";
-  editedCabalFile = "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37";
+  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
+    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 ];
@@ -60,4 +29,4 @@ mkDerivation {
   description = "Haskell98 invariant functors";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/isomorphism-class.nix b/pkgs/isomorphism-class.nix
new file mode 100644
index 0000000000000000000000000000000000000000..20e39afb3da640edc220579b862e3421908445e9
--- /dev/null
+++ b/pkgs/isomorphism-class.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, QuickCheck, base, bytestring, containers, hashable
+, lib, primitive, quickcheck-instances, rebase, tasty, tasty-hunit
+, tasty-quickcheck, text, unordered-containers, vector
+}:
+mkDerivation {
+  pname = "isomorphism-class";
+  version = "0.1.0.9";
+  sha256 = "2fbaa8cf141489a2107e294e50628dc7797b8e3218069bdfbc387ab9547d1bb4";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    base bytestring containers hashable primitive text
+    unordered-containers vector
+  ];
+  testHaskellDepends = [
+    base bytestring containers hashable primitive QuickCheck
+    quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text
+    unordered-containers vector
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/nikita-volkov/isomorphism-class";
+  description = "Isomorphism typeclass solving the conversion problem";
+  license = lib.licenses.mit;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/jira-wiki-markup.nix b/pkgs/jira-wiki-markup.nix
index 6edfb6afaae740c0ed19f6c470f9ccd4e5eb038a..cbe4c8739ae67a39c16ee73954d9a3e3ef1d0fff 100644
--- a/pkgs/jira-wiki-markup.nix
+++ b/pkgs/jira-wiki-markup.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, lib, mtl, parsec, tasty, tasty-hunit, text }:
 mkDerivation {
   pname = "jira-wiki-markup";
-  version = "1.4.0";
-  sha256 = "1c210d3c575779a7b5b974e6873b265117944746862b5bb40684903a8decca5c";
-  revision = "1";
-  editedCabalFile = "043x87s8lyg0ck2krwdn1ncr0sxc7p03jmgykwyvg8c7i56n3m7n";
+  version = "1.5.1";
+  sha256 = "9ca23d369c3ccf1b3ffb209dda8e6288a5f5901fb8235113825fa48d3ae8e520";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -22,4 +20,4 @@ mkDerivation {
   description = "Handle Jira wiki markup";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/language-c.nix b/pkgs/language-c.nix
index 0f62b6d4a9c18ac1fcface29e4e37a1fd4fad514..ae0642fbb20179bf97bb29276dba58b6a924ce93 100644
--- a/pkgs/language-c.nix
+++ b/pkgs/language-c.nix
@@ -1,36 +1,16 @@
-{ mkDerivation
-, alex
-, array
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, happy
-, lib
-, mtl
-, pretty
-, process
+{ mkDerivation, alex, array, base, bytestring, containers, deepseq
+, directory, filepath, happy, lib, mtl, pretty, process
 }:
 mkDerivation {
   pname = "language-c";
-  version = "0.9.1";
-  sha256 = "94359566eb5da62f539fa62500f8a861db4e3eafb956d66c6821d6ffad96ad3c";
+  version = "0.9.2";
+  sha256 = "b2310d2fda16df72e9f8f63ef18bec2e09ae3aff5891dc948c3d9cb72cef6cb3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    pretty
-    process
+    array base bytestring containers deepseq directory filepath mtl
+    pretty process
   ];
   libraryToolDepends = [ alex happy ];
   testHaskellDepends = [ base directory filepath process ];
@@ -45,4 +25,4 @@ mkDerivation {
   description = "Analysis and generation of C code";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lens-aeson.nix b/pkgs/lens-aeson.nix
index ae9e46136256378e53dd7303426bc8a454295f47..fbc4b05c699bafdd47dc3667a931cbeda81e8917 100644
--- a/pkgs/lens-aeson.nix
+++ b/pkgs/lens-aeson.nix
@@ -1,36 +1,16 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, bytestring
-, lens
-, lib
-, scientific
-, text
-, text-short
-, unordered-containers
-, vector
+{ mkDerivation, aeson, attoparsec, base, bytestring, lens, lib
+, scientific, text, text-short, unordered-containers, vector
 }:
 mkDerivation {
   pname = "lens-aeson";
-  version = "1.2.1";
-  sha256 = "347199fe28324940bfa9dfb29010ae37510854cc51f8ef88d0a621afe6daa023";
-  revision = "3";
-  editedCabalFile = "0lqpl5fhl94fm3xcwf8ssz7yg9nyfxp9bw2z959x7hg6bcqmv9p1";
+  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
+    aeson attoparsec base bytestring lens scientific text text-short
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +23,4 @@ mkDerivation {
   description = "Law-abiding lenses for aeson";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lens.nix b/pkgs/lens.nix
index a30e220dd3f9216b1c71f02800fdcc475e3aa858..8f81bb82ffabb3a482e0583caeffb83bf23a5c1e 100644
--- a/pkgs/lens.nix
+++ b/pkgs/lens.nix
@@ -1,118 +1,38 @@
-{ 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, 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";
-  sha256 = "b33e2ebede468d9e8acb79d20bb5a5947fc3bec13cc39b122aa131c5e6dcd188";
+  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
+    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
-    containers
-    deepseq
-    HUnit
-    mtl
-    QuickCheck
-    simple-reflect
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    transformers
+    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
+    base base-compat bytestring comonad containers criterion deepseq
+    generic-deriving transformers unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -125,4 +45,4 @@ mkDerivation {
   description = "Lenses, Folds and Traversals";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/libsodium.nix b/pkgs/libsodium.nix
index 31e87e85275bf065aeac05c189c35165d7f93804..45c3ac52c0fd274563ee8a4cf572482b7979779c 100644
--- a/pkgs/libsodium.nix
+++ b/pkgs/libsodium.nix
@@ -1,17 +1,10 @@
-{ mkDerivation
-, base
-, c2hs
-, hedgehog
-, lib
-, libsodium
-, tasty
-, tasty-hedgehog
-, tasty-hunit
+{ mkDerivation, base, c2hs, hedgehog, lib, libsodium, tasty
+, tasty-hedgehog, tasty-hunit
 }:
 mkDerivation {
   pname = "libsodium";
-  version = "1.0.18.2";
-  sha256 = "9cc7620f019993b04019df6a2563831beee2eb93b45431fad728c63be7312108";
+  version = "1.0.18.3";
+  sha256 = "da90c7c7908d949186688cbc5069c087b0a77bbde3f0b14bdb1bb1103d78854d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,11 +12,7 @@ mkDerivation {
   libraryPkgconfigDepends = [ libsodium ];
   libraryToolDepends = [ c2hs ];
   testHaskellDepends = [
-    base
-    hedgehog
-    tasty
-    tasty-hedgehog
-    tasty-hunit
+    base hedgehog tasty tasty-hedgehog tasty-hunit
   ];
   testPkgconfigDepends = [ libsodium ];
   testToolDepends = [ c2hs ];
@@ -38,4 +27,4 @@ mkDerivation {
   description = "Low-level bindings to the libsodium C library";
   license = lib.licenses.isc;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lift-type.nix b/pkgs/lift-type.nix
index 58234a44c42244e3fb45d80a9ae3c0e6acca1a99..314d012a46605ab8329a58f08fd6615a1a7919bb 100644
--- a/pkgs/lift-type.nix
+++ b/pkgs/lift-type.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, template-haskell }:
 mkDerivation {
   pname = "lift-type";
-  version = "0.1.0.1";
-  sha256 = "aeb79e3090a38130fdb1da374e9e50e132e6bf5e20b45de58af5230d9c8f2585";
+  version = "0.1.1.1";
+  sha256 = "10d81032a69175a9c0c6f97358962ac8e5663b1b9a798fc96c7ec227aad7370d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Lift a type from a Typeable constraint to a Template Haskell type";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lifted-async.nix b/pkgs/lifted-async.nix
index b5854c14f81ebd7c7e7d4d9ff3a322cc7be6d1fd..5f3e066b717a7b09df8f892e10c58ca5f84d1eee 100644
--- a/pkgs/lifted-async.nix
+++ b/pkgs/lifted-async.nix
@@ -1,46 +1,20 @@
-{ 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, 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.1";
-  sha256 = "0d05715f44bb5464f97bac46302a81338271375b07c54c90efb33b1c0e298e48";
+  version = "0.10.2.4";
+  sha256 = "9bed4dee15f40c35a4d92a2d8ca29e4a9fe7904a5b773486dfef58040a3ebe5d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    constraints
-    lifted-base
-    monad-control
-    transformers-base
+    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
+    async base HUnit lifted-base monad-control mtl tasty
+    tasty-expected-failure tasty-hunit tasty-th
   ];
   benchmarkHaskellDepends = [ async base deepseq tasty-bench ];
   enableLibraryProfiling = true;
@@ -54,4 +28,4 @@ mkDerivation {
   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/linear-base.nix b/pkgs/linear-base.nix
index 575ce294841b8817d7616883d1583fb662c9c556..7a29ce1ab36a04ac074f8e6af70d07f4bdc31085 100644
--- a/pkgs/linear-base.nix
+++ b/pkgs/linear-base.nix
@@ -1,73 +1,28 @@
-{ mkDerivation
-, MonadRandom
-, base
-, containers
-, deepseq
-, gauge
-, 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
+{ mkDerivation, MonadRandom, base, containers, deepseq, gauge
+, 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
 }:
 mkDerivation {
   pname = "linear-base";
-  version = "0.3.0";
-  sha256 = "65e4dafd21f5e2bc709cd65526e09090f348b594814f1068dd68aba48cd0302c";
+  version = "0.3.1";
+  sha256 = "10ec4ba4068762362f9921e824ea06e3a69efa08d89ad593e8a5a7113d5fa8be";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    hashable
-    linear-generics
-    primitive
-    storable-tuple
-    text
-    transformers
-    vector
+    base containers ghc-prim hashable linear-generics primitive
+    storable-tuple text transformers vector
   ];
   testHaskellDepends = [
-    base
-    containers
-    hedgehog
-    inspection-testing
-    linear-generics
-    mmorph
-    storable-tuple
-    tasty
-    tasty-hedgehog
-    tasty-inspection-testing
-    text
+    base containers hedgehog inspection-testing linear-generics mmorph
+    storable-tuple tasty tasty-hedgehog tasty-inspection-testing text
     vector
   ];
   benchmarkHaskellDepends = [
-    base
-    deepseq
-    gauge
-    hashable
-    hashtables
-    MonadRandom
-    random
-    random-shuffle
-    unordered-containers
-    vector
+    base deepseq gauge hashable hashtables MonadRandom random
+    random-shuffle unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -80,4 +35,4 @@ mkDerivation {
   description = "Standard library for linear types";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/linear-generics.nix b/pkgs/linear-generics.nix
index 4a170aa9ac44607223f146acf841fd1427901f5c..60a9b023ebd0264ec0ca4ecbbccedcc729034a4a 100644
--- a/pkgs/linear-generics.nix
+++ b/pkgs/linear-generics.nix
@@ -1,26 +1,15 @@
-{ mkDerivation
-, base
-, containers
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, template-haskell
-, th-abstraction
+{ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
+, lib, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "linear-generics";
-  version = "0.2";
-  sha256 = "5f0bb89fc65e7752fd328d427cc6493a30b8edacc6a062595094ae3fea09819a";
+  version = "0.2.1";
+  sha256 = "ad23ba9ae3c0a542e6140b1481e3d2e9a8e092888d79949cfadd560d43d89497";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    template-haskell
-    th-abstraction
+    base containers ghc-prim template-haskell th-abstraction
   ];
   testHaskellDepends = [ base hspec template-haskell ];
   testToolDepends = [ hspec-discover ];
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Generic programming library for generalised deriving";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/linear.nix b/pkgs/linear.nix
index 34a226b60a5ca7d68254369ca4ec4202b16a9f43..56b6bbe6822c95ddde224192dba6cfb6d605984c 100644
--- a/pkgs/linear.nix
+++ b/pkgs/linear.nix
@@ -1,79 +1,29 @@
-{ mkDerivation
-, HUnit
-, adjunctions
-, base
-, base-orphans
-, binary
-, bytes
-, bytestring
-, cereal
-, containers
-, deepseq
-, distributive
-, ghc-prim
-, hashable
-, indexed-traversable
-, lens
-, lib
-, random
-, reflection
-, semigroupoids
-, semigroups
-, simple-reflect
-, tagged
-, template-haskell
-, test-framework
-, test-framework-hunit
-, transformers
-, transformers-compat
-, unordered-containers
-, vector
+{ mkDerivation, HUnit, adjunctions, base, base-orphans, binary
+, bytes, bytestring, cereal, containers, deepseq, distributive
+, ghc-prim, hashable, indexed-traversable, lens, lib, random
+, reflection, semigroupoids, simple-reflect, tagged
+, template-haskell, test-framework, test-framework-hunit
+, transformers, transformers-compat, unordered-containers, vector
 , void
 }:
 mkDerivation {
   pname = "linear";
-  version = "1.21.10";
-  sha256 = "b90733227c9d4047e087a0083785e8293dc623169161c6dab12ece1ac90d7ab4";
+  version = "1.22";
+  sha256 = "cfe43e392d0e9b2fd5647bde962b0678681de580260ad30e5f29ae490a03b9b5";
+  revision = "1";
+  editedCabalFile = "1p94bq3pwqvj4qd1lp0w84k514xd9vib76gw0d16q1xh27c2sz4h";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    base
-    base-orphans
-    binary
-    bytes
-    cereal
-    containers
-    deepseq
-    distributive
-    ghc-prim
-    hashable
-    indexed-traversable
-    lens
-    random
-    reflection
-    semigroupoids
-    semigroups
-    tagged
-    template-haskell
-    transformers
-    transformers-compat
-    unordered-containers
-    vector
-    void
+    adjunctions base base-orphans binary bytes cereal containers
+    deepseq distributive ghc-prim hashable indexed-traversable lens
+    random reflection semigroupoids tagged template-haskell
+    transformers transformers-compat unordered-containers vector void
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    HUnit
-    reflection
-    simple-reflect
-    test-framework
-    test-framework-hunit
-    vector
+    base binary bytestring deepseq HUnit reflection simple-reflect
+    test-framework test-framework-hunit vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -86,4 +36,4 @@ mkDerivation {
   description = "Linear Algebra";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/list-t.nix b/pkgs/list-t.nix
index e8d17e61bf91afc5ad12f0cc2c90703f71ddc8de..8198f037530624631d995953e075b3cf72e97bc9 100644
--- a/pkgs/list-t.nix
+++ b/pkgs/list-t.nix
@@ -1,34 +1,15 @@
-{ mkDerivation
-, HTF
-, base
-, base-prelude
-, foldl
-, lib
-, logict
-, mmorph
-, monad-control
-, mtl
-, mtl-prelude
-, semigroups
-, transformers
-, transformers-base
+{ mkDerivation, HTF, base, base-prelude, foldl, lib, logict, mmorph
+, monad-control, mtl, mtl-prelude, transformers, transformers-base
 }:
 mkDerivation {
   pname = "list-t";
-  version = "1.0.5.3";
-  sha256 = "adf3d36457d4c505bd7c9d5f81760145102d10d66503240fe24c3882947b6e48";
+  version = "1.0.5.6";
+  sha256 = "4f13658a166fc5b07ef57145ef266e3fb2426ed3c96bff89e556e12de7608bc6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    foldl
-    logict
-    mmorph
-    monad-control
-    mtl
-    semigroups
-    transformers
+    base foldl logict mmorph monad-control mtl transformers
     transformers-base
   ];
   testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
@@ -43,4 +24,4 @@ mkDerivation {
   description = "ListT done right";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/log-base.nix b/pkgs/log-base.nix
index dfdc101b120dc1cb62b9a677ce80062a5736cdee..9e07d15af072b8306d0df086e1aaff852ba938a3 100644
--- a/pkgs/log-base.nix
+++ b/pkgs/log-base.nix
@@ -1,46 +1,19 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, base
-, bytestring
-, deepseq
-, exceptions
-, lib
-, mmorph
-, monad-control
-, mtl
-, semigroups
-, stm
-, text
-, time
-, transformers-base
-, unliftio-core
+{ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
+, exceptions, lib, mmorph, monad-control, mtl, semigroups, stm
+, text, time, transformers-base, unliftio-core
 , unordered-containers
 }:
 mkDerivation {
   pname = "log-base";
-  version = "0.12.0.0";
-  sha256 = "4f6735d4daeec234b32480cea9bddbc5952fdeba73f2ee88c06698eb2136c47c";
+  version = "0.12.0.1";
+  sha256 = "44e37f318de0f415eff5116d1614e5c0ec6ba41acf690f072bf8f8f726872c08";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    deepseq
-    exceptions
-    mmorph
-    monad-control
-    mtl
-    semigroups
-    stm
-    text
-    time
-    transformers-base
-    unliftio-core
-    unordered-containers
+    aeson aeson-pretty base bytestring deepseq exceptions mmorph
+    monad-control mtl semigroups stm text time transformers-base
+    unliftio-core unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +26,4 @@ mkDerivation {
   description = "Structured logging solution (base package)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lpeg.nix b/pkgs/lpeg.nix
index e67d94b9ca2298d333eeecbc5958213933be7716..90db3d31b1a0376b4f26475bfca0d5e4638b552c 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.3";
-  sha256 = "e1c1f4891931f469dc78a6cd2a528fcc27b645e0df5ecf1a975f50c4dbd67ba7";
+  version = "1.0.4";
+  sha256 = "24084721a225f133682aa12c5ff4f65c7ea7b6b03894c6af0504864bea2054bb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "LPeg – Parsing Expression Grammars For Lua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lua-arbitrary.nix b/pkgs/lua-arbitrary.nix
index 5d6f544cab67a85f85cc1d3bc44250c76a27e70c..100abfb848ec5beb089b2b73db2734ce340bc797 100644
--- a/pkgs/lua-arbitrary.nix
+++ b/pkgs/lua-arbitrary.nix
@@ -1,8 +1,8 @@
 { mkDerivation, QuickCheck, base, lib, lua }:
 mkDerivation {
   pname = "lua-arbitrary";
-  version = "1.0.1";
-  sha256 = "aadeb5fbcd7de95a64374a959ffc6b341db171fd3db570d1cc0cfae3f7bce205";
+  version = "1.0.1.1";
+  sha256 = "d5f6143d9c99d44453fff535b912ad0d7ce8cb5500b1d9dc47947952e2637b4d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Arbitrary instances for Lua types";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lua.nix b/pkgs/lua.nix
index 615330e501d7496c4f55976f2809f7ccf2f53381..9bf3cd904230a1467ccd8431d7bb8825b8f7f2a6 100644
--- a/pkgs/lua.nix
+++ b/pkgs/lua.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib, lua5_4, tasty, tasty-hunit }:
 mkDerivation {
   pname = "lua";
-  version = "2.2.1";
-  sha256 = "85546fb11ee349d3182ce11bd3046e644c2964fcfc39c797c2cd1a12e588961f";
+  version = "2.3.1";
+  sha256 = "b92515811f6b1400a39d517e1aa95e406aa45cd11aa5cc6a4db65dd76f1fc753";
   configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
   isLibrary = true;
   isExecutable = false;
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Lua, an embeddable scripting language";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/managed.nix b/pkgs/managed.nix
index dcd2bdc5c8beebdf35a3cf549cac73156d8d647e..cfbbefd43c7a6804c04bc2e20e5503bfce559391 100644
--- a/pkgs/managed.nix
+++ b/pkgs/managed.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, lib, transformers }:
 mkDerivation {
   pname = "managed";
-  version = "1.0.9";
-  sha256 = "4d476da3b6e7a14220f2e3a764e5d43bf339e89a3dc46a7bdfdeb3856a54a86f";
-  revision = "3";
-  editedCabalFile = "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664";
+  version = "1.0.10";
+  sha256 = "3a22ca9d50c1efc2725ca244d60df0a79118119bef1aa2128589d93bbf99f759";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +17,4 @@ mkDerivation {
   description = "A monad for managed values";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/megaparsec.nix b/pkgs/megaparsec.nix
index 4b4a569c65e644ce583de9b47ad0c641993e54a2..70537483f9b0d12d253c60b065072d16118e0f91 100644
--- a/pkgs/megaparsec.nix
+++ b/pkgs/megaparsec.nix
@@ -1,45 +1,20 @@
-{ mkDerivation
-, base
-, bytestring
-, case-insensitive
-, containers
-, criterion
-, deepseq
-, lib
-, mtl
-, parser-combinators
-, scientific
-, text
-, transformers
-, weigh
+{ mkDerivation, base, bytestring, case-insensitive, containers
+, criterion, deepseq, lib, mtl, parser-combinators, scientific
+, text, transformers, weigh
 }:
 mkDerivation {
   pname = "megaparsec";
-  version = "9.2.2";
-  sha256 = "a48b03e55c0b9efcc88ce4236186fb6eee3acb64336987dd9c98daf4d96aa234";
+  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
+    base bytestring case-insensitive containers deepseq mtl
+    parser-combinators scientific text transformers
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    containers
-    criterion
-    deepseq
-    text
-    weigh
+    base bytestring containers criterion deepseq text weigh
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +27,4 @@ mkDerivation {
   description = "Monadic parser combinators";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microlens-aeson.nix b/pkgs/microlens-aeson.nix
index ed6f321371e767a28bd436ae885a84e5ce3d8f47..d8872c6476e2d699fc992d319b14c30656ea8886 100644
--- a/pkgs/microlens-aeson.nix
+++ b/pkgs/microlens-aeson.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, bytestring
-, hashable
-, lib
-, microlens
-, scientific
-, tasty
-, tasty-hunit
-, text
-, vector
+{ mkDerivation, aeson, attoparsec, base, bytestring, hashable, lib
+, microlens, scientific, tasty, tasty-hunit, text, vector
 }:
 mkDerivation {
   pname = "microlens-aeson";
@@ -20,25 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    bytestring
-    hashable
-    microlens
-    scientific
-    text
+    aeson attoparsec base bytestring hashable microlens scientific text
     vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    hashable
-    microlens
-    tasty
-    tasty-hunit
-    text
+    aeson base bytestring hashable microlens tasty tasty-hunit text
     vector
   ];
   enableLibraryProfiling = true;
@@ -52,4 +27,4 @@ mkDerivation {
   description = "Law-abiding lenses for Aeson, using microlens";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microlens-ghc.nix b/pkgs/microlens-ghc.nix
index ea2e50d4034ce97c6051e7157a0c6ac6ba358cd5..137705fd0d369f45ee32455440aa960adb87bd7e 100644
--- a/pkgs/microlens-ghc.nix
+++ b/pkgs/microlens-ghc.nix
@@ -1,26 +1,15 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, lib
-, microlens
+{ mkDerivation, array, base, bytestring, containers, lib, microlens
 , transformers
 }:
 mkDerivation {
   pname = "microlens-ghc";
-  version = "0.4.14.0";
-  sha256 = "618fc86da128ac23e27d384e8d889486c13b9922884a6633a03199369f1592c7";
+  version = "0.4.14.1";
+  sha256 = "56709b10a1b3feba4fc107d7302a51020d90f893b8aac913f8b85750f663dcc0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    microlens
-    transformers
+    array base bytestring containers microlens transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "microlens + array, bytestring, containers, transformers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microlens-mtl.nix b/pkgs/microlens-mtl.nix
index 0bd1eea760db4090d3cadd0f14b0733ad6760886..6c2b2383b73d6f0bc8545701d2d3fca63c47a34a 100644
--- a/pkgs/microlens-mtl.nix
+++ b/pkgs/microlens-mtl.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, lib
-, microlens
-, mtl
-, transformers
+{ mkDerivation, base, lib, microlens, mtl, transformers
 , transformers-compat
 }:
 mkDerivation {
   pname = "microlens-mtl";
-  version = "0.2.0.2";
-  sha256 = "66971668f376717fdbe75e3b8ac99d2efd89c746b41355f6d388a63352a43278";
+  version = "0.2.0.3";
+  sha256 = "4d6b6af37179814fe47e11763ea61b423b698bc15869f94e82c6a5e9fd079fc6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    microlens
-    mtl
-    transformers
-    transformers-compat
+    base microlens mtl transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   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 192a86f93c2452a9e5358947ad872bf554c51ef2..ade19bb0648e2b76b37e32e18ba84d152b727240 100644
--- a/pkgs/microlens-platform.nix
+++ b/pkgs/microlens-platform.nix
@@ -1,32 +1,16 @@
-{ mkDerivation
-, base
-, hashable
-, lib
-, microlens
-, microlens-ghc
-, microlens-mtl
-, microlens-th
-, text
-, unordered-containers
-, vector
+{ mkDerivation, base, hashable, lib, microlens, microlens-ghc
+, microlens-mtl, microlens-th, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "microlens-platform";
-  version = "0.4.3.2";
-  sha256 = "52075123128d894ab43e89aef94d079c2465c07035e40738052553202fe5d38a";
+  version = "0.4.3.3";
+  sha256 = "5ec7853b372ede912d727368820da5a14455361e1f8a8a7701705cc80fa8468f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hashable
-    microlens
-    microlens-ghc
-    microlens-mtl
-    microlens-th
-    text
-    unordered-containers
-    vector
+    base hashable microlens microlens-ghc microlens-mtl microlens-th
+    text unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +23,4 @@ mkDerivation {
   description = "microlens + all batteries included (best for apps)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microlens-th.nix b/pkgs/microlens-th.nix
index 59f8590010c1d79dd403932447362266d7dff1d8..a2724d4a56ad5ac4954820343219668558454fbd 100644
--- a/pkgs/microlens-th.nix
+++ b/pkgs/microlens-th.nix
@@ -1,28 +1,15 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, microlens
-, tagged
-, template-haskell
-, th-abstraction
-, transformers
+{ mkDerivation, base, containers, lib, microlens, tagged
+, template-haskell, th-abstraction, transformers
 }:
 mkDerivation {
   pname = "microlens-th";
-  version = "0.4.3.10";
-  sha256 = "2c50100235949c00defcdb8c01d8eb5e2e45e524a9b552d3c0c8bb8224ece2b5";
-  revision = "1";
-  editedCabalFile = "142wksvc854qmd665qd6mwzik8g02yzfpjk1fpxw4mlcns06y4m2";
+  version = "0.4.3.11";
+  sha256 = "f21aaadea14a90fef53fa661eb375ac492c88c3bf023592fdd13e4ee285352ee";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    microlens
-    template-haskell
-    th-abstraction
+    base containers microlens template-haskell th-abstraction
     transformers
   ];
   testHaskellDepends = [ base microlens tagged ];
@@ -37,4 +24,4 @@ mkDerivation {
   description = "Automatic generation of record lenses for microlens";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microlens.nix b/pkgs/microlens.nix
index 798d21d510d443299e5ad1f040b2587f68a3fd79..a535446b4440df30a6a21346c63705c880a90cf9 100644
--- a/pkgs/microlens.nix
+++ b/pkgs/microlens.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "microlens";
-  version = "0.4.13.0";
-  sha256 = "fc21d0f0ea30a3c73c681c2a2f5093dbebea8f3075243dcf2b8d234aacb210a3";
+  version = "0.4.13.1";
+  sha256 = "0a54abee8ff4f6aeb4bea0783409a3dbd28a4e7a892bac916b0fb6a71382d7fc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A tiny lens library with no dependencies";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microstache.nix b/pkgs/microstache.nix
index 971c5ffc72048cff8c8c45b01698b1bda5bb471c..0118ab0d4d7b391686d756474fd159d6c3a62653 100644
--- a/pkgs/microstache.nix
+++ b/pkgs/microstache.nix
@@ -1,51 +1,23 @@
-{ mkDerivation
-, aeson
-, base
-, base-orphans
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, lib
-, parsec
-, tasty
-, tasty-hunit
-, text
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, aeson, base, base-orphans, bytestring, containers
+, deepseq, directory, filepath, lib, parsec, tasty, tasty-hunit
+, text, transformers, unordered-containers, vector
 }:
 mkDerivation {
   pname = "microstache";
-  version = "1.0.2.2";
-  sha256 = "f0a1dbef45a137e1af0e29ea4b9585788217cc1c6f1db7d68a4f659916dd36ac";
+  version = "1.0.2.3";
+  sha256 = "df7a13175783603bfb095e7a5eda9a24eec7d5fd490946d107ad578bb436d29a";
+  revision = "1";
+  editedCabalFile = "04chnz0dcf30a5x90kwqdiad1qbyimmiqgbm38b6m3w72k408hfi";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    directory
-    filepath
-    parsec
-    text
-    transformers
-    unordered-containers
-    vector
+    aeson base containers deepseq directory filepath parsec text
+    transformers unordered-containers vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-orphans
-    bytestring
-    containers
-    parsec
-    tasty
-    tasty-hunit
-    text
+    aeson base base-orphans bytestring containers parsec tasty
+    tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +30,4 @@ mkDerivation {
   description = "Mustache templates for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mod.nix b/pkgs/mod.nix
index 2aa23b2a9144fc04059f9cc870afdecd7449bfba..339f978650c1201248682fa421adf374dd1cc50e 100644
--- a/pkgs/mod.nix
+++ b/pkgs/mod.nix
@@ -1,41 +1,20 @@
-{ mkDerivation
-, base
-, deepseq
-, integer-gmp
-, lib
-, primitive
-, quickcheck-classes
-, quickcheck-classes-base
-, semirings
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, vector
+{ mkDerivation, base, containers, deepseq, ghc-bignum, lib
+, primitive, quickcheck-classes, quickcheck-classes-base, semirings
+, tasty, tasty-bench, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "mod";
-  version = "0.1.2.2";
-  sha256 = "db98ad817c45e89984428cae6b5f88074220955035520cafe552ce2146f32255";
+  version = "0.2.0.1";
+  sha256 = "2a63f8e4e88545093cd57df02911906554e77704df3ee5c7a12044e48630e872";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    integer-gmp
-    primitive
-    semirings
-    vector
+    base deepseq ghc-bignum primitive semirings vector
   ];
   testHaskellDepends = [
-    base
-    primitive
-    quickcheck-classes
-    quickcheck-classes-base
-    semirings
-    tasty
-    tasty-quickcheck
-    vector
+    base containers primitive quickcheck-classes
+    quickcheck-classes-base semirings tasty tasty-quickcheck vector
   ];
   benchmarkHaskellDepends = [ base tasty-bench ];
   enableLibraryProfiling = true;
@@ -49,4 +28,4 @@ mkDerivation {
   description = "Fast type-safe modular arithmetic";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-logger.nix b/pkgs/monad-logger.nix
index 7ba57d6ac8456d8008e4c8302485dc247a511911..149467d09e9bb9ec2ae543410d2e9317dbb8b440 100644
--- a/pkgs/monad-logger.nix
+++ b/pkgs/monad-logger.nix
@@ -1,54 +1,23 @@
-{ mkDerivation
-, base
-, bytestring
-, conduit
-, conduit-extra
-, exceptions
-, fast-logger
-, lib
-, lifted-base
-, monad-control
-, monad-loops
-, mtl
-, resourcet
-, stm
-, stm-chans
-, template-haskell
-, text
-, transformers
-, transformers-base
-, transformers-compat
+{ mkDerivation, base, bytestring, conduit, conduit-extra
+, exceptions, fast-logger, lib, lifted-base, monad-control
+, monad-loops, mtl, resourcet, stm, stm-chans, template-haskell
+, text, transformers, transformers-base, transformers-compat
 , unliftio-core
 }:
 mkDerivation {
   pname = "monad-logger";
-  version = "0.3.37";
-  sha256 = "0604d581a039c5d1d61c9dce7331c63cf2a68482ee32f0ff38927d24882a47fc";
-  revision = "3";
-  editedCabalFile = "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z";
+  version = "0.3.39";
+  sha256 = "d3f23b047dda7a3f74b89289a3171c1059d50898f63f671006baab61e01729a5";
+  revision = "1";
+  editedCabalFile = "0nj4qpmp6i5lmfbk7f1shljx8g2062fq6y857y4f9avp1cb9zm7d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-extra
-    exceptions
-    fast-logger
-    lifted-base
-    monad-control
-    monad-loops
-    mtl
-    resourcet
-    stm
-    stm-chans
-    template-haskell
-    text
-    transformers
-    transformers-base
-    transformers-compat
-    unliftio-core
+    base bytestring conduit conduit-extra exceptions fast-logger
+    lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+    template-haskell text transformers transformers-base
+    transformers-compat unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +30,4 @@ mkDerivation {
   description = "A class of monads which can log messages";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monoid-subclasses.nix b/pkgs/monoid-subclasses.nix
index d3cc9469afec5ca6b0d96117a931346a6110f66f..907e0509267cd27dcc3df8c838622a40f9631a8b 100644
--- a/pkgs/monoid-subclasses.nix
+++ b/pkgs/monoid-subclasses.nix
@@ -1,44 +1,21 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, lib
-, primes
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, text
-, vector
+{ mkDerivation, QuickCheck, base, bytestring
+, commutative-semigroups, containers, lib, primes
+, quickcheck-instances, tasty, tasty-quickcheck, text, vector
 }:
 mkDerivation {
   pname = "monoid-subclasses";
-  version = "1.1.3";
-  sha256 = "9bf112d64c08438733e17fc0ef8fb2bae004d043ea9672c541f1d20c429cf4d9";
-  revision = "1";
-  editedCabalFile = "0y8sw3zsmz5ssn2gl2fsqg44n7xf3xsf6vhrzwnkbaa97hj76nh2";
+  version = "1.2.2";
+  sha256 = "627b1a46cbfbb829cdb6cf1200d717062c388d56f698cec61f582e56ed5c0ca4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    primes
-    text
+    base bytestring commutative-semigroups containers primes text
     vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    primes
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    text
-    vector
+    base bytestring containers primes QuickCheck quickcheck-instances
+    tasty tasty-quickcheck text vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +28,4 @@ mkDerivation {
   description = "Subclasses of Monoid";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/net-mqtt.nix b/pkgs/net-mqtt.nix
index 81f4ca3c786e399be394d1b699e253864fccb099..94e1780f8992e9a12f46272cb04e8e5395a3df07 100644
--- a/pkgs/net-mqtt.nix
+++ b/pkgs/net-mqtt.nix
@@ -1,98 +1,31 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "net-mqtt";
-  version = "0.8.2.2";
-  sha256 = "c3e30f445a7aef4374b015ceb4239d659bab81dfb879f1675a17b458f4f44da9";
+  version = "0.8.2.5";
+  sha256 = "3d41045cbc9b1adbaccab90ee9a4bc3e751fb41d50ea2fa65f7024231f7cde4c";
   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
+    async attoparsec attoparsec-binary base binary bytestring conduit
+    conduit-extra connection containers deepseq network-conduit-tls
+    network-uri QuickCheck stm text 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
+    async attoparsec attoparsec-binary base binary bytestring conduit
+    conduit-extra connection containers deepseq network-conduit-tls
+    network-uri optparse-applicative QuickCheck stm text 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
+    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
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -105,4 +38,4 @@ mkDerivation {
   description = "An MQTT Protocol Implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-uri.nix b/pkgs/network-uri.nix
index ff5cd10cbb7f16246db78d6e2b9fe9dc46cc192e..3c11bb419ecb415d2528d9ed3b8915f38f08a245 100644
--- a/pkgs/network-uri.nix
+++ b/pkgs/network-uri.nix
@@ -1,38 +1,19 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, criterion
-, deepseq
-, lib
-, parsec
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
+{ 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.1";
-  sha256 = "57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584";
+  version = "2.6.4.2";
+  sha256 = "9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    parsec
-    template-haskell
-    th-compat
+    base deepseq parsec template-haskell th-compat
   ];
   testHaskellDepends = [
-    base
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base criterion deepseq HUnit ];
   enableLibraryProfiling = true;
@@ -46,4 +27,4 @@ mkDerivation {
   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
index 8b8b83842eac7568d1e2bfbb35e8362da23c793d..745a3453bcc81a757cfd9ff5d84035a252c05da0 100644
--- a/pkgs/network.nix
+++ b/pkgs/network.nix
@@ -1,31 +1,16 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, deepseq
-, directory
-, hspec
-, hspec-discover
-, lib
-, temporary
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, deepseq
+, directory, hspec, hspec-discover, lib, temporary
 }:
 mkDerivation {
   pname = "network";
-  version = "3.1.2.7";
-  sha256 = "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85";
+  version = "3.1.2.8";
+  sha256 = "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring deepseq directory ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    hspec
-    HUnit
-    QuickCheck
-    temporary
+    base bytestring directory hspec HUnit QuickCheck temporary
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   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 caa8803dca83dde5a5d24a83f22140d9413bda44..84b91e81ad57c96576145fb0685dc11add5b09cc 100644
--- a/pkgs/nonempty-vector.nix
+++ b/pkgs/nonempty-vector.nix
@@ -1,25 +1,17 @@
-{ mkDerivation
-, Cabal
-, base
-, cabal-doctest
-, deepseq
-, doctest
-, lib
-, primitive
-, vector
+{ mkDerivation, QuickCheck, base, deepseq, lib, primitive, tasty
+, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "nonempty-vector";
-  version = "0.2.1.0";
-  sha256 = "3e88159a1ad63039aba427597ea9d7eaf6e86789279d92e16214391b1bb2ce70";
-  revision = "1";
-  editedCabalFile = "18w57f8sdix71a27gwbifw7hmg34lms22c99gp7i7j7g154f3cn3";
+  version = "0.2.2.0";
+  sha256 = "6fc72cf173486d76e2f9e2bfc5749ed07e070fc26807594906124d99cac5db59";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [ base deepseq primitive vector ];
-  testHaskellDepends = [ base doctest ];
+  testHaskellDepends = [
+    base QuickCheck tasty tasty-quickcheck vector
+  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Non-empty vectors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/openapi3.nix b/pkgs/openapi3.nix
index 09f22ae22bc697acfdcfa85f8768a8abfda8179d..7a5becc16663f1c15bb5931913394eab4a04dfe8 100644
--- a/pkgs/openapi3.nix
+++ b/pkgs/openapi3.nix
@@ -1,100 +1,34 @@
-{ mkDerivation
-, Cabal
-, Glob
-, HUnit
-, QuickCheck
-, aeson
-, aeson-pretty
-, base
-, base-compat-batteries
-, bytestring
-, cabal-doctest
-, containers
-, cookie
-, doctest
-, generics-sop
-, hashable
-, hspec
-, hspec-discover
-, http-media
-, insert-ordered-containers
-, lens
-, lib
-, mtl
-, network
-, optics-core
-, optics-th
-, quickcheck-instances
-, scientific
-, template-haskell
-, text
-, time
-, transformers
-, unordered-containers
-, utf8-string
-, uuid-types
-, vector
+{ mkDerivation, Cabal, Glob, HUnit, QuickCheck, aeson, aeson-pretty
+, base, base-compat-batteries, bytestring, cabal-doctest
+, containers, cookie, doctest, generics-sop, hashable, hspec
+, hspec-discover, http-media, insert-ordered-containers, lens, lib
+, mtl, optics-core, optics-th, quickcheck-instances, scientific
+, template-haskell, text, time, transformers, unordered-containers
+, utf8-string, uuid-types, vector
 }:
 mkDerivation {
   pname = "openapi3";
-  version = "3.2.2";
-  sha256 = "325d491e305de60510f5267b3eccdc2719d4a8e5784577d7e79aef28368d6134";
-  revision = "2";
-  editedCabalFile = "1yc3wlc8j84glav3hzx1l4yq33k05bll252a8yl6ld275jjswn8p";
+  version = "3.2.3";
+  sha256 = "d4e4570955bcc66fde72c3070bc3ef4bcf54b82ef71448f6541256d79dfa736b";
+  revision = "1";
+  editedCabalFile = "1wvvwh13pfwl015k2hm8h7fylfjimfm16w56a8sx9aqxf0x03cdh";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base-compat-batteries
-    bytestring
-    containers
-    cookie
-    generics-sop
-    hashable
-    http-media
-    insert-ordered-containers
-    lens
-    mtl
-    network
-    optics-core
-    optics-th
-    QuickCheck
-    scientific
-    template-haskell
-    text
-    time
-    transformers
-    unordered-containers
-    uuid-types
-    vector
+    aeson aeson-pretty base base-compat-batteries bytestring containers
+    cookie generics-sop hashable http-media insert-ordered-containers
+    lens mtl optics-core optics-th QuickCheck scientific
+    template-haskell text time transformers unordered-containers
+    uuid-types vector
   ];
   executableHaskellDepends = [ aeson base lens text ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat-batteries
-    bytestring
-    containers
-    doctest
-    Glob
-    hashable
-    hspec
-    HUnit
-    insert-ordered-containers
-    lens
-    mtl
-    QuickCheck
-    quickcheck-instances
-    template-haskell
-    text
-    time
-    unordered-containers
-    utf8-string
-    vector
+    aeson base base-compat-batteries bytestring containers doctest Glob
+    hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+    quickcheck-instances template-haskell text time
+    unordered-containers utf8-string vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -108,4 +42,4 @@ mkDerivation {
   description = "OpenAPI 3.0 data model";
   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 0b79016a6cad47d118f3a5bad7acd54f53a80ccf..0acd2276f945e58b291575cac93becf88332522f 100644
--- a/pkgs/optparse-generic.nix
+++ b/pkgs/optparse-generic.nix
@@ -1,37 +1,19 @@
-{ mkDerivation
-, Only
-, base
-, bytestring
-, lib
-, optparse-applicative
-, system-filepath
-, text
-, time
-, transformers
-, transformers-compat
+{ mkDerivation, Only, base, bytestring, lib, optparse-applicative
+, system-filepath, text, time, transformers, transformers-compat
 , void
 }:
 mkDerivation {
   pname = "optparse-generic";
-  version = "1.4.8";
-  sha256 = "aa45862d5c59b21403fbd6f6771fa8047b7c82043efbd38bbe59e08ae5961a81";
-  revision = "1";
-  editedCabalFile = "0rgh8sy2w7rh5n1sz0jxcq892myplbli15snggi77dflv00ic7zd";
+  version = "1.4.9";
+  sha256 = "b2003624446c2c2341063433507cb0e1c8c84dd723d3105d8aa249010984b9cf";
   isLibrary = true;
-  isExecutable = false;
+  isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    Only
-    optparse-applicative
-    system-filepath
-    text
-    time
-    transformers
-    transformers-compat
-    void
+    base bytestring Only optparse-applicative system-filepath text time
+    transformers transformers-compat void
   ];
+  executableHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -42,4 +24,4 @@ mkDerivation {
   description = "Auto-generate a command-line parser for your datatype";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pager.nix b/pkgs/pager.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5c7a8c6d23c730e92c5f2b8594c8fe20b3c10507
--- /dev/null
+++ b/pkgs/pager.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, base, bytestring, conduit, conduit-extra, directory
+, lib, process, resourcet, safe, terminfo, text, transformers, unix
+}:
+mkDerivation {
+  pname = "pager";
+  version = "0.1.1.0";
+  sha256 = "3e1e4f2ca17be6dd68d2d480f29e7a770c0f7ca3109aa1980da677d96cd4eef3";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = true;
+  libraryHaskellDepends = [
+    base bytestring conduit conduit-extra directory process resourcet
+    safe terminfo text transformers unix
+  ];
+  executableHaskellDepends = [ base bytestring conduit-extra text ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/pharpend/pager";
+  description = "Open up a pager, like 'less' or 'more'";
+  license = lib.licenses.bsd2;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/pandoc-lua-marshal.nix b/pkgs/pandoc-lua-marshal.nix
index 0cca570ac453e7ac71cd57a52a270c99179edd0b..f47006c7cfe701d07beab548a53842fa1f527f72 100644
--- a/pkgs/pandoc-lua-marshal.nix
+++ b/pkgs/pandoc-lua-marshal.nix
@@ -1,56 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, exceptions
-, hslua
-, hslua-marshalling
-, lib
-, lua
-, pandoc-types
-, safe
-, tasty
-, tasty-hunit
-, tasty-lua
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, aeson, base, bytestring, containers
+, exceptions, hslua, hslua-list, hslua-marshalling, lib, lua
+, pandoc-types, safe, tasty, tasty-hunit, tasty-lua
+, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "pandoc-lua-marshal";
-  version = "0.1.7";
-  sha256 = "b29415580645e78824b134f8508eae3800cab4fd647d736622c0d286dc59c95e";
+  version = "0.2.2";
+  sha256 = "22231c24a7b228b3d0b99dcfb77657b410f8a95f02b6bde365b434a8f1882679";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua
-    hslua-marshalling
-    lua
-    pandoc-types
-    safe
-    text
+    aeson base bytestring containers exceptions hslua hslua-list
+    hslua-marshalling lua pandoc-types safe text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    exceptions
-    hslua
-    hslua-marshalling
-    lua
-    pandoc-types
-    QuickCheck
-    safe
-    tasty
-    tasty-hunit
-    tasty-lua
-    tasty-quickcheck
-    text
+    aeson base bytestring containers exceptions hslua hslua-list
+    hslua-marshalling lua pandoc-types QuickCheck safe tasty
+    tasty-hunit tasty-lua tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -63,4 +30,4 @@ mkDerivation {
   description = "Use pandoc types in Lua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pandoc-types.nix b/pkgs/pandoc-types.nix
index 9e60f449a7101e9571d7c9d5c1993aff0e7d1820..f0c70d49f82f9f687b4c94d3fa9b77452bdcb610 100644
--- a/pkgs/pandoc-types.nix
+++ b/pkgs/pandoc-types.nix
@@ -1,54 +1,22 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "pandoc-types";
-  version = "1.22.2.1";
-  sha256 = "4ce796129d67c73967bc0b301c7110bc7dbab7a53b4d1e147ba257991661659d";
+  version = "1.23";
+  sha256 = "5e6721410219c0a39b05fc732de9864745592fffa8287ad6e87c66138a51162d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-prim
-    QuickCheck
-    syb
-    text
-    transformers
+    aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+    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 string-qq syb
+    test-framework test-framework-hunit test-framework-quickcheck2 text
   ];
   benchmarkHaskellDepends = [ base criterion text ];
   enableLibraryProfiling = true;
@@ -62,4 +30,4 @@ mkDerivation {
   description = "Types for representing a structured document";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pandoc.nix b/pkgs/pandoc.nix
index cae9f7f71e0b2e2545b3911989dd911f82a1ce3a..2a9a40ee993fa84baf24ade549f6907995326efe 100644
--- a/pkgs/pandoc.nix
+++ b/pkgs/pandoc.nix
@@ -1,211 +1,46 @@
-{ 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
-, hslua
-, hslua-aeson
-, hslua-module-doclayout
-, hslua-module-path
-, hslua-module-system
-, hslua-module-text
-, hslua-module-version
-, http-client
-, http-client-tls
-, http-types
-, ipynb
-, jira-wiki-markup
-, lib
-, lpeg
-, mtl
-, network
-, network-uri
-, pandoc-lua-marshal
-, pandoc-types
-, parsec
-, pretty
-, pretty-show
-, process
-, random
-, safe
-, scientific
-, servant-server
-, skylighting
-, skylighting-core
-, split
-, syb
-, tagsoup
-, tasty
-, tasty-bench
-, tasty-golden
-, tasty-hunit
-, tasty-lua
-, tasty-quickcheck
-, temporary
-, texmath
-, text
-, text-conversions
-, time
-, unicode-collation
-, unicode-transforms
-, unix
-, wai
-, wai-extra
-, warp
-, xml
-, xml-conduit
-, xml-types
-, yaml
-, zip-archive
-, zlib
+{ 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
 }:
 mkDerivation {
   pname = "pandoc";
-  version = "2.19.2";
-  sha256 = "36e83694c36a5af35a4442c4d5abd4273289d9d309793466f59c1632e87d4245";
+  version = "3.1.1";
+  sha256 = "d8bf5ca02a54b10bc0980848eb10697fa5c83d0c452a9afcea2ec823a9168537";
   configureFlags = [ "-f-trypandoc" ];
   isLibrary = true;
-  isExecutable = true;
+  isExecutable = false;
   enableSeparateDataOutput = true;
   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
-    hslua
-    hslua-aeson
-    hslua-module-doclayout
-    hslua-module-path
-    hslua-module-system
-    hslua-module-text
-    hslua-module-version
-    http-client
-    http-client-tls
-    http-types
-    ipynb
-    jira-wiki-markup
-    JuicyPixels
-    lpeg
-    mtl
-    network
-    network-uri
-    pandoc-lua-marshal
-    pandoc-types
-    parsec
-    pretty
-    pretty-show
-    process
-    random
-    safe
-    scientific
-    servant-server
-    SHA
-    skylighting
-    skylighting-core
-    split
-    syb
-    tagsoup
-    temporary
-    texmath
-    text
-    text-conversions
-    time
-    unicode-collation
-    unicode-transforms
-    unix
-    wai
-    xml
-    xml-conduit
-    xml-types
-    yaml
-    zip-archive
-    zlib
+    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
   ];
-  executableHaskellDepends = [ base safe wai-extra warp ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    Diff
-    directory
-    doctemplates
-    exceptions
-    filepath
-    Glob
-    hslua
-    mtl
-    pandoc-types
-    process
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-lua
-    tasty-quickcheck
-    text
-    time
-    xml
-    zip-archive
+    base bytestring containers Diff directory doctemplates filepath
+    Glob mtl pandoc-types process tasty tasty-golden tasty-hunit
+    tasty-quickcheck text time xml zip-archive
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    mtl
-    tasty-bench
-    text
+    base bytestring deepseq mtl tasty-bench text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -222,4 +57,4 @@ mkDerivation {
   description = "Conversion between markup formats";
   license = lib.licenses.gpl2Plus;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsec.nix b/pkgs/parsec.nix
index e399a892a8d97080de17d14832ad6c62bd66cf51..63c6864cf56e6e8f631188856cd89049ae8a771d 100644
--- a/pkgs/parsec.nix
+++ b/pkgs/parsec.nix
@@ -1,16 +1,10 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, mtl
-, tasty
-, tasty-hunit
+{ mkDerivation, base, bytestring, lib, mtl, tasty, tasty-hunit
 , text
 }:
 mkDerivation {
   pname = "parsec";
-  version = "3.1.15.1";
-  sha256 = "abe4901531185505d4360e633e8d79ccc90325a0bac7f666eecad30f7f7f98dd";
+  version = "3.1.16.1";
+  sha256 = "a41962e5d76ea68658876735b8d5b755e0eff336b079d0a2f439c364755d1246";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -27,4 +21,4 @@ mkDerivation {
   description = "Monadic parser combinators";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/password.nix b/pkgs/password.nix
index 47e98c3b975f492714aea7fa48da508b1e73bccf..2bc2070229e9e9b9d68ef29f482fd83164efd795 100644
--- a/pkgs/password.nix
+++ b/pkgs/password.nix
@@ -1,58 +1,24 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, base
-, base-compat
-, base64
-, bytestring
-, cabal-doctest
-, cryptonite
-, doctest
-, lib
-, memory
-, password-types
-, quickcheck-instances
-, scrypt
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
+{ mkDerivation, Cabal, QuickCheck, base, base-compat, base64
+, bytestring, cabal-doctest, cryptonite, doctest, lib, memory
+, password-types, quickcheck-instances, scrypt, tasty, tasty-hunit
+, tasty-quickcheck, template-haskell, text
 }:
 mkDerivation {
   pname = "password";
-  version = "3.0.2.0";
-  sha256 = "14c5b664ec2d3064059f8de7170c4eb10e847397de9f98a841b8ea5ea6cf4c24";
+  version = "3.0.2.1";
+  sha256 = "e935fcab166fae63e1fc02155d12e61881d1daac8edfca9f125ea7f44aa2d60d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    base
-    base64
-    bytestring
-    cryptonite
-    memory
-    password-types
-    template-haskell
-    text
+    base base64 bytestring cryptonite memory password-types
+    template-haskell text
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    cryptonite
-    doctest
-    memory
-    password-types
-    QuickCheck
-    quickcheck-instances
-    scrypt
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
-    text
+    base base-compat base64 bytestring cryptonite doctest memory
+    password-types QuickCheck quickcheck-instances scrypt tasty
+    tasty-hunit tasty-quickcheck template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +31,4 @@ mkDerivation {
   description = "Hashing and checking of passwords";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/path-io.nix b/pkgs/path-io.nix
index acc76e63cb4cc71a72b52988f87dbfea07490afb..a11aeada3fee8410f825e3fa483ea9630376af86 100644
--- a/pkgs/path-io.nix
+++ b/pkgs/path-io.nix
@@ -1,46 +1,20 @@
-{ mkDerivation
-, base
-, containers
-, directory
-, dlist
-, exceptions
-, filepath
-, hspec
-, lib
-, path
-, temporary
-, time
-, transformers
+{ mkDerivation, base, containers, directory, dlist, exceptions
+, filepath, hspec, lib, path, temporary, time, transformers
 , unix-compat
 }:
 mkDerivation {
   pname = "path-io";
-  version = "1.7.0";
-  sha256 = "34bd41820298757bda9fbdc8a07ecb574bc4d78d1260025b1644813ea08d21cb";
+  version = "1.8.0";
+  sha256 = "83a6b3f6b8f00ab17b4a24d6e46b07139ae3155f2a2348b2062222398bf406c7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    directory
-    dlist
-    exceptions
-    filepath
-    path
-    temporary
-    time
-    transformers
-    unix-compat
+    base containers directory dlist exceptions filepath path temporary
+    time transformers unix-compat
   ];
   testHaskellDepends = [
-    base
-    directory
-    exceptions
-    filepath
-    hspec
-    path
-    transformers
+    base directory exceptions filepath hspec path transformers
     unix-compat
   ];
   enableLibraryProfiling = true;
@@ -54,4 +28,4 @@ mkDerivation {
   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/persistent-postgresql.nix b/pkgs/persistent-postgresql.nix
index c6e031ed34f12872b972dd49e736aec162ea08cc..cb2ead684fa09e3408292790249086a031f17369 100644
--- a/pkgs/persistent-postgresql.nix
+++ b/pkgs/persistent-postgresql.nix
@@ -1,95 +1,31 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, attoparsec
-, base
-, blaze-builder
-, bytestring
-, conduit
-, containers
-, fast-logger
-, hspec
-, hspec-expectations
-, hspec-expectations-lifted
-, http-api-data
-, lib
-, monad-logger
-, mtl
-, path-pieces
-, persistent
-, persistent-qq
-, persistent-test
-, postgresql-libpq
-, postgresql-simple
-, quickcheck-instances
-, resource-pool
-, resourcet
-, string-conversions
-, text
-, time
-, transformers
-, unliftio
-, unliftio-core
-, unordered-containers
-, vault
-, vector
+{ mkDerivation, HUnit, QuickCheck, aeson, attoparsec, base
+, blaze-builder, bytestring, conduit, containers, fast-logger
+, hspec, hspec-expectations, hspec-expectations-lifted
+, http-api-data, lib, monad-logger, mtl, path-pieces, persistent
+, persistent-qq, persistent-test, postgresql-libpq
+, postgresql-simple, quickcheck-instances, resource-pool, resourcet
+, string-conversions, text, time, transformers, unliftio
+, unliftio-core, unordered-containers, vault, vector
 }:
 mkDerivation {
   pname = "persistent-postgresql";
-  version = "2.13.5.0";
-  sha256 = "0d4de220014a4d9dd981717655e8119ee9d3ca105fe6f2df5763656713f130e1";
+  version = "2.13.5.2";
+  sha256 = "712892e70e5cc0b470506b938ab41785dfcfee36f382017673de50ebf78c105d";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    blaze-builder
-    bytestring
-    conduit
-    containers
-    monad-logger
-    mtl
-    persistent
-    postgresql-libpq
-    postgresql-simple
-    resource-pool
-    resourcet
-    string-conversions
-    text
-    time
-    transformers
-    unliftio-core
-    vault
+    aeson attoparsec base blaze-builder bytestring conduit containers
+    monad-logger mtl persistent postgresql-libpq postgresql-simple
+    resource-pool resourcet string-conversions text time transformers
+    unliftio-core vault
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    fast-logger
-    hspec
-    hspec-expectations
-    hspec-expectations-lifted
-    http-api-data
-    HUnit
-    monad-logger
-    path-pieces
-    persistent
-    persistent-qq
-    persistent-test
-    QuickCheck
-    quickcheck-instances
-    resourcet
-    text
-    time
-    transformers
-    unliftio
-    unliftio-core
-    unordered-containers
-    vector
+    aeson base bytestring containers fast-logger hspec
+    hspec-expectations hspec-expectations-lifted http-api-data HUnit
+    monad-logger path-pieces persistent persistent-qq persistent-test
+    QuickCheck quickcheck-instances resourcet text time transformers
+    unliftio unliftio-core unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -102,4 +38,4 @@ mkDerivation {
   description = "Backend for the persistent library using postgresql";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/persistent-qq.nix b/pkgs/persistent-qq.nix
index 53ef1bc170e4d34bae4bfcb902a60bb250dc87ce..294b118da906c389fc6631adccecb1fffcb32592 100644
--- a/pkgs/persistent-qq.nix
+++ b/pkgs/persistent-qq.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, HUnit
-, aeson
-, base
-, bytestring
-, fast-logger
-, haskell-src-meta
-, hspec
-, lib
-, monad-logger
-, mtl
-, persistent
-, persistent-sqlite
-, resourcet
-, template-haskell
-, text
-, unliftio
+{ mkDerivation, HUnit, aeson, base, bytestring, fast-logger
+, haskell-src-meta, hspec, lib, monad-logger, mtl, persistent
+, persistent-sqlite, resourcet, template-haskell, text, unliftio
 }:
 mkDerivation {
   pname = "persistent-qq";
@@ -24,29 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    haskell-src-meta
-    mtl
-    persistent
-    template-haskell
-    text
+    base haskell-src-meta mtl persistent template-haskell text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    fast-logger
-    haskell-src-meta
-    hspec
-    HUnit
-    monad-logger
-    mtl
-    persistent
-    persistent-sqlite
-    resourcet
-    template-haskell
-    text
-    unliftio
+    aeson base bytestring fast-logger haskell-src-meta hspec HUnit
+    monad-logger mtl persistent persistent-sqlite resourcet
+    template-haskell text unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +28,4 @@ mkDerivation {
   description = "Provides a quasi-quoter for raw SQL for persistent";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/persistent-sqlite.nix b/pkgs/persistent-sqlite.nix
index 0d68badb56750ea8562291cafe559963e864a4ec..a4ccd673cdaa0b5f9e14b764fa89980584f7218b 100644
--- a/pkgs/persistent-sqlite.nix
+++ b/pkgs/persistent-sqlite.nix
@@ -1,83 +1,29 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, base
-, bytestring
-, conduit
-, containers
-, exceptions
-, fast-logger
-, hspec
-, lib
-, microlens
-, microlens-th
-, monad-logger
-, mtl
-, persistent
-, persistent-test
-, resource-pool
-, resourcet
-, sqlite
-, system-fileio
-, system-filepath
-, temporary
-, text
-, time
-, transformers
-, unliftio-core
+{ mkDerivation, HUnit, QuickCheck, aeson, base, bytestring, conduit
+, containers, exceptions, fast-logger, hspec, lib, microlens
+, microlens-th, monad-logger, mtl, persistent, persistent-test
+, resource-pool, resourcet, sqlite, system-fileio, system-filepath
+, temporary, text, time, transformers, unliftio-core
 , unordered-containers
 }:
 mkDerivation {
   pname = "persistent-sqlite";
-  version = "2.13.1.0";
-  sha256 = "2b2885f4e8031bbd5f342549c5fbb48cd6c3489930ea641bf5c681b02d2806fd";
+  version = "2.13.1.1";
+  sha256 = "f2da6df242d3fb40fa256c8e6de0fa53d40d1b091ec7a6ded5001552ed07fa28";
   configureFlags = [ "-fsystemlib" ];
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    conduit
-    containers
-    microlens-th
-    monad-logger
-    mtl
-    persistent
-    resource-pool
-    resourcet
-    text
-    time
-    transformers
-    unliftio-core
-    unordered-containers
+    aeson base bytestring conduit containers microlens-th monad-logger
+    mtl persistent resource-pool resourcet text time transformers
+    unliftio-core unordered-containers
   ];
   librarySystemDepends = [ sqlite ];
   testHaskellDepends = [
-    base
-    bytestring
-    conduit
-    containers
-    exceptions
-    fast-logger
-    hspec
-    HUnit
-    microlens
-    monad-logger
-    mtl
-    persistent
-    persistent-test
-    QuickCheck
-    resourcet
-    system-fileio
-    system-filepath
-    temporary
-    text
-    time
-    transformers
-    unliftio-core
+    base bytestring conduit containers exceptions fast-logger hspec
+    HUnit microlens monad-logger mtl persistent persistent-test
+    QuickCheck resourcet system-fileio system-filepath temporary text
+    time transformers unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -90,4 +36,4 @@ mkDerivation {
   description = "Backend for the persistent library using sqlite3";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/persistent-template.nix b/pkgs/persistent-template.nix
index db885a29773dee2aef1da65fdfbf622e88ff9180..bf30342e7263e6db49a48c21d3c07ba9c7f358e6 100644
--- a/pkgs/persistent-template.nix
+++ b/pkgs/persistent-template.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Type-safe, non-relational, multi-backend persistence";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/persistent-test.nix b/pkgs/persistent-test.nix
index 2ea8223feb795d4721bace70a6d6e00b9942541d..c42f71b5a9174bc9bfb8c9059f162649f2d6fba4 100644
--- a/pkgs/persistent-test.nix
+++ b/pkgs/persistent-test.nix
@@ -1,32 +1,9 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, base
-, blaze-html
-, bytestring
-, conduit
-, containers
-, exceptions
-, hspec
-, hspec-expectations
-, http-api-data
-, lib
-, monad-control
-, monad-logger
-, mtl
-, path-pieces
-, persistent
-, quickcheck-instances
-, random
-, resourcet
-, text
-, time
-, transformers
-, transformers-base
-, unliftio
-, unliftio-core
-, unordered-containers
+{ mkDerivation, HUnit, QuickCheck, aeson, base, blaze-html
+, bytestring, conduit, containers, exceptions, hspec
+, hspec-expectations, http-api-data, lib, monad-control
+, monad-logger, mtl, path-pieces, persistent, quickcheck-instances
+, random, resourcet, text, time, transformers, transformers-base
+, unliftio, unliftio-core, unordered-containers
 }:
 mkDerivation {
   pname = "persistent-test";
@@ -36,33 +13,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    blaze-html
-    bytestring
-    conduit
-    containers
-    exceptions
-    hspec
-    hspec-expectations
-    http-api-data
-    HUnit
-    monad-control
-    monad-logger
-    mtl
-    path-pieces
-    persistent
-    QuickCheck
-    quickcheck-instances
-    random
-    resourcet
-    text
-    time
-    transformers
-    transformers-base
-    unliftio
-    unliftio-core
-    unordered-containers
+    aeson base blaze-html bytestring conduit containers exceptions
+    hspec hspec-expectations http-api-data HUnit monad-control
+    monad-logger mtl path-pieces persistent QuickCheck
+    quickcheck-instances random resourcet text time transformers
+    transformers-base unliftio unliftio-core unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -75,4 +30,4 @@ mkDerivation {
   description = "Tests for Persistent";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/persistent.nix b/pkgs/persistent.nix
index b57b0d48298d410d2ee50d0fbe3693665fa4bdd4..e6b98796eb710d7f2d17c28961e33910e80d4f7b 100644
--- a/pkgs/persistent.nix
+++ b/pkgs/persistent.nix
@@ -1,119 +1,36 @@
-{ 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
-, quickcheck-instances
-, resource-pool
-, resourcet
-, scientific
-, shakespeare
-, silently
-, template-haskell
-, text
-, th-lift-instances
-, time
-, transformers
-, unliftio
-, unliftio-core
-, unordered-containers
-, vault
-, vector
+{ 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
+, quickcheck-instances, resource-pool, resourcet, scientific
+, shakespeare, silently, template-haskell, text, th-lift-instances
+, time, transformers, unliftio, unliftio-core, unordered-containers
+, vault, vector
 }:
 mkDerivation {
   pname = "persistent";
-  version = "2.14.3.0";
-  sha256 = "1288244f62d334dbe65cae6157098de38419b8445d5cc227281e688310189a19";
-  revision = "2";
-  editedCabalFile = "0mv747s5g64jir461i3say83d9bfh0wl05qfwllpgq3g2nxc35p7";
+  version = "2.14.5.0";
+  sha256 = "04618a23e71256abaa4aa0b8f1d9577305b2840334cc1fbe3382f190853c46ee";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base64-bytestring
-    blaze-html
-    bytestring
-    conduit
-    containers
-    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 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
-    conduit
-    containers
-    fast-logger
-    hspec
-    http-api-data
-    monad-logger
-    mtl
-    path-pieces
-    QuickCheck
-    quickcheck-instances
-    resource-pool
-    resourcet
-    scientific
-    shakespeare
-    silently
-    template-haskell
-    text
-    th-lift-instances
-    time
-    transformers
-    unliftio
-    unliftio-core
-    unordered-containers
-    vector
+    aeson attoparsec base base64-bytestring blaze-html bytestring
+    conduit containers deepseq fast-logger hspec http-api-data
+    monad-logger mtl path-pieces QuickCheck quickcheck-instances
+    resource-pool resourcet scientific shakespeare silently
+    template-haskell text th-lift-instances time transformers unliftio
+    unliftio-core unordered-containers vector
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    file-embed
-    template-haskell
-    text
+    base criterion deepseq file-embed template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -126,4 +43,4 @@ mkDerivation {
   description = "Type-safe, multi-backend data serialization";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pg-entity.nix b/pkgs/pg-entity.nix
index 8d1325e8361ee33141ea029596ec86268584ac45..1661d04eb249275d15c1c1bea88bdd6a0d4305f0 100644
--- a/pkgs/pg-entity.nix
+++ b/pkgs/pg-entity.nix
@@ -1,78 +1,26 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "pg-entity";
-  version = "0.0.2.0";
-  sha256 = "3bcc0981b43722de34b2d610ddfef8c43fb97607297a0b4052a4d2425364113d";
-  revision = "1";
-  editedCabalFile = "03f0isq7vdjc1xbdchb5l0ggbf61jkxn2q1bii6sx8nphfgk4c9j";
+  version = "0.0.4.2";
+  sha256 = "3722a6055459b50fb2cbf5b0374dec6e533aab1725ebad87f89ae004596eb565";
   isLibrary = true;
-  isExecutable = false;
+  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 exceptions monad-control parsec
+    pg-transact postgresql-simple resource-pool safe-exceptions
+    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
+    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
   ];
   enableLibraryProfiling = true;
@@ -86,4 +34,4 @@ mkDerivation {
   description = "A pleasant PostgreSQL layer";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pointed.nix b/pkgs/pointed.nix
index a3f4111cdd13f6fa92b22a10a69948b7dec6ec2d..0dfc9b1034e6ab25d241ee7def641b9260a3be02 100644
--- a/pkgs/pointed.nix
+++ b/pkgs/pointed.nix
@@ -1,40 +1,20 @@
-{ mkDerivation
-, base
-, comonad
-, containers
-, data-default-class
-, hashable
-, kan-extensions
-, lib
-, semigroupoids
-, semigroups
-, stm
-, tagged
-, transformers
-, transformers-compat
-, unordered-containers
+{ mkDerivation, base, comonad, containers, data-default-class
+, hashable, kan-extensions, lib, semigroupoids, semigroups, stm
+, tagged, transformers, transformers-compat, unordered-containers
 }:
 mkDerivation {
   pname = "pointed";
   version = "5.0.4";
   sha256 = "a3c72eb2b0c36727a9852947e3a772246e931e97a53245381042330d453760d7";
+  revision = "1";
+  editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    comonad
-    containers
-    data-default-class
-    hashable
-    kan-extensions
-    semigroupoids
-    semigroups
-    stm
-    tagged
-    transformers
-    transformers-compat
-    unordered-containers
+    base comonad containers data-default-class hashable kan-extensions
+    semigroupoids semigroups stm tagged transformers
+    transformers-compat unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +27,4 @@ mkDerivation {
   description = "Pointed and copointed data";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-methodology.nix b/pkgs/polysemy-methodology.nix
index 93b481c51c6656205d92994bdfa4eae85d4bada0..2bf56b2759e96c96e53cd4d9ecb9b02b9ca385bd 100644
--- a/pkgs/polysemy-methodology.nix
+++ b/pkgs/polysemy-methodology.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, lib
-, polysemy
-, polysemy-kvstore
+{ mkDerivation, base, lib, polysemy, polysemy-kvstore
 , polysemy-several
 }:
 mkDerivation {
   pname = "polysemy-methodology";
-  version = "0.2.1.0";
-  sha256 = "2fccb2a89981389d2a2be827025177a32f4196cd46c69992d53af8aa0b35ad9e";
-  revision = "2";
-  editedCabalFile = "0dpancn85f8j3pxhk43lik6fbznp502cc68rkhqkan791kh1bbc7";
+  version = "0.2.2.0";
+  sha256 = "4adedfd60b1590b265fb8ec15e636ec7521f668a1042f96adc6a1083075a1009";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    polysemy
-    polysemy-kvstore
-    polysemy-several
+    base polysemy polysemy-kvstore polysemy-several
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,4 +21,4 @@ mkDerivation {
   description = "Domain modelling algebra for polysemy";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-test.nix b/pkgs/polysemy-test.nix
index 2447fa4b83fe5ce7abc37fa7001bb801871f3c62..f905fd696f1cfbedaf899214f67903e091470128 100644
--- a/pkgs/polysemy-test.nix
+++ b/pkgs/polysemy-test.nix
@@ -1,40 +1,19 @@
-{ mkDerivation
-, base
-, hedgehog
-, incipit-core
-, lib
-, path
-, path-io
-, polysemy
-, tasty
-, tasty-hedgehog
-, transformers
+{ mkDerivation, base, hedgehog, incipit-core, lib, path, path-io
+, polysemy, tasty, tasty-hedgehog, transformers
 }:
 mkDerivation {
   pname = "polysemy-test";
-  version = "0.6.0.0";
-  sha256 = "f0f6a7c812875c9a2263c7a1a093fdc8cb653f4c5384843231cbdd4e25797d24";
+  version = "0.7.0.0";
+  sha256 = "d4b3588cba21b69990ee483e37536b4b1e411f94774c62f90202360f8709d768";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    hedgehog
-    incipit-core
-    path
-    path-io
-    polysemy
-    tasty
-    tasty-hedgehog
-    transformers
+    base hedgehog incipit-core path path-io polysemy tasty
+    tasty-hedgehog transformers
   ];
   testHaskellDepends = [
-    base
-    hedgehog
-    incipit-core
-    path
-    polysemy
-    tasty
+    base hedgehog incipit-core path polysemy tasty
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   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 7f1a5c1bb120d14e2e95f2c5e25216018757bc1e..774c9fd83613b39b96d862e789e1fec0016874f5 100644
--- a/pkgs/polysemy-time.nix
+++ b/pkgs/polysemy-time.nix
@@ -1,37 +1,18 @@
-{ mkDerivation
-, aeson
-, base
-, incipit-core
-, lib
-, polysemy-test
-, stm
-, tasty
-, template-haskell
-, time
-, torsor
+{ mkDerivation, aeson, base, incipit-core, lib, polysemy-test
+, tasty, template-haskell, time, torsor
 }:
 mkDerivation {
   pname = "polysemy-time";
-  version = "0.5.1.0";
-  sha256 = "857dbbe99e6e6a1a061aa9cac88a630f2bddc0c748ed8ec8d076b3b44d11e59a";
+  version = "0.6.0.0";
+  sha256 = "5764ea3ab9c8b3c6e5c73fd7700f29ba49c82dc06fbb5f40650783c663b8854e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    incipit-core
-    stm
-    template-haskell
-    time
-    torsor
+    aeson base incipit-core template-haskell time torsor
   ];
   testHaskellDepends = [
-    base
-    incipit-core
-    polysemy-test
-    tasty
-    time
+    base incipit-core polysemy-test tasty time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +25,4 @@ mkDerivation {
   description = "Polysemy effects 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 9106f26c4f2639b327af3592a1d051b35d392739..223f3cb9076573d5acd13ae79fa2e0fd7a5f547d 100644
--- a/pkgs/polysemy-zoo.nix
+++ b/pkgs/polysemy-zoo.nix
@@ -1,66 +1,24 @@
-{ mkDerivation
-, async
-, base
-, compact
-, constraints
-, containers
-, contravariant
-, exceptions
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, mtl
-, polysemy
-, polysemy-plugin
-, random
-, reflection
-, streaming
-, text
-, transformers
+{ mkDerivation, async, base, constraints, containers, contravariant
+, exceptions, ghc-compact, ghc-prim, hspec, hspec-discover, lib
+, mtl, polysemy, polysemy-plugin, random, reflection, streaming
+, text, transformers
 }:
 mkDerivation {
   pname = "polysemy-zoo";
-  version = "0.8.0.0";
-  sha256 = "8c46937c61c980ac3024c4eeb1bf32a686eb2c5bcc2a65fad25d102512c89afa";
+  version = "0.8.1.0";
+  sha256 = "2d786f3e178f49a17d7d0e21b58a763da1a032ef8136b492700f3856ef94145d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    compact
-    constraints
-    containers
-    contravariant
-    exceptions
-    ghc-prim
-    mtl
-    polysemy
-    random
-    reflection
-    streaming
-    text
+    async base constraints containers contravariant exceptions
+    ghc-compact ghc-prim mtl polysemy random reflection streaming text
     transformers
   ];
   testHaskellDepends = [
-    async
-    base
-    compact
-    constraints
-    containers
-    contravariant
-    exceptions
-    ghc-prim
-    hspec
-    mtl
-    polysemy
-    polysemy-plugin
-    random
-    reflection
-    streaming
-    text
-    transformers
+    async base constraints containers contravariant exceptions
+    ghc-compact ghc-prim hspec mtl polysemy polysemy-plugin random
+    reflection streaming text transformers
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -74,4 +32,4 @@ mkDerivation {
   description = "Experimental, user-contributed effects and interpreters for polysemy";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy.nix b/pkgs/polysemy.nix
index 454ce3d637bed23f75460b8a28e83a14b6d7474b..d8e1fb337fda50798bddf5fe8b3d96cccc4aa27f 100644
--- a/pkgs/polysemy.nix
+++ b/pkgs/polysemy.nix
@@ -1,88 +1,26 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, async
-, base
-, cabal-doctest
-, containers
-, criterion
-, doctest
-, first-class-families
-, free
-, freer-simple
-, hspec
-, hspec-discover
-, inspection-testing
-, lib
-, mtl
-, stm
-, syb
-, template-haskell
-, th-abstraction
-, transformers
-, type-errors
-, unagi-chan
+{ mkDerivation, Cabal, async, base, cabal-doctest, containers
+, doctest, first-class-families, hspec, hspec-discover
+, inspection-testing, lib, mtl, stm, syb, template-haskell
+, th-abstraction, transformers, type-errors, unagi-chan
 }:
 mkDerivation {
   pname = "polysemy";
-  version = "1.7.1.0";
-  sha256 = "4c9556c0c3f38f5fa655567106ecb53cd357e6ffaf8289753ba6dc26fd4bc224";
+  version = "1.9.0.0";
+  sha256 = "3926c967e414132e40683ac273c7618ad55898b134a1e16b121ea15c81d51503";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    async
-    base
-    containers
-    first-class-families
-    mtl
-    QuickCheck
-    stm
-    syb
-    template-haskell
-    th-abstraction
-    transformers
-    type-errors
-    unagi-chan
+    async base containers first-class-families mtl stm syb
+    template-haskell th-abstraction transformers type-errors unagi-chan
   ];
   testHaskellDepends = [
-    async
-    base
-    containers
-    doctest
-    first-class-families
-    hspec
-    inspection-testing
-    mtl
-    QuickCheck
-    stm
-    syb
-    template-haskell
-    th-abstraction
-    transformers
-    type-errors
-    unagi-chan
+    async base containers doctest first-class-families hspec
+    hspec-discover inspection-testing mtl stm syb template-haskell
+    th-abstraction transformers type-errors unagi-chan
   ];
   testToolDepends = [ hspec-discover ];
-  benchmarkHaskellDepends = [
-    async
-    base
-    containers
-    criterion
-    first-class-families
-    free
-    freer-simple
-    mtl
-    QuickCheck
-    stm
-    syb
-    template-haskell
-    th-abstraction
-    transformers
-    type-errors
-    unagi-chan
-  ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -94,4 +32,4 @@ mkDerivation {
   description = "Higher-order, low-boilerplate free monads";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/postgresql-libpq.nix b/pkgs/postgresql-libpq.nix
index f98f13d8508e200f07ce927fbe6d67d7c7892631..42b21e29148a4f0822a6f890bf491c2d7dac6cc7 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.4.3";
-  sha256 = "e3e246dcd55352fce514969a72a6fe37771102034fb8e662fdc7ae780b83d6bd";
-  revision = "3";
-  editedCabalFile = "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs";
+  version = "0.9.5.0";
+  sha256 = "d1592bd805c088bb0c136c03eea92af9c1d7dbd85e32d0b6d522fd940f325470";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -23,4 +21,4 @@ mkDerivation {
   description = "low-level binding to libpq";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/postgresql-migration.nix b/pkgs/postgresql-migration.nix
index 9098a6bdea8c437de98447ba9a519add9df6cb63..97f84420c93ef92870d65cfeba3e252c039d9e60 100644
--- a/pkgs/postgresql-migration.nix
+++ b/pkgs/postgresql-migration.nix
@@ -1,43 +1,20 @@
-{ mkDerivation
-, base
-, base64-bytestring
-, bytestring
-, cryptohash
-, directory
-, filepath
-, hspec
-, lib
-, postgresql-simple
-, text
-, time
+{ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+, directory, filepath, hspec, lib, postgresql-simple, text, time
 }:
 mkDerivation {
   pname = "postgresql-migration";
-  version = "0.2.1.4";
-  sha256 = "1a208648901a320650da06d4bde50caf95560721fd9c7aae005cc647d57b195d";
+  version = "0.2.1.6";
+  sha256 = "6ef9efa84bf30b9d5a7dbd869648a71c48da784ff222fb74c06f4ca493baa67f";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    cryptohash
-    directory
-    filepath
-    postgresql-simple
-    text
-    time
+    base base64-bytestring bytestring cryptohash directory filepath
+    postgresql-simple text time
   ];
   executableHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    cryptohash
-    directory
-    postgresql-simple
-    text
-    time
+    base base64-bytestring bytestring cryptohash directory
+    postgresql-simple text time
   ];
   testHaskellDepends = [ base bytestring hspec postgresql-simple ];
   enableLibraryProfiling = true;
@@ -51,4 +28,4 @@ mkDerivation {
   description = "PostgreSQL Schema Migrations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/postgresql-simple-migration.nix b/pkgs/postgresql-simple-migration.nix
index 0ed2ac0ffb41e81c96874cdcbb53cc90b959d7ee..58b3bd4ec06fa7a610290b9958d97071c4a69f5f 100644
--- a/pkgs/postgresql-simple-migration.nix
+++ b/pkgs/postgresql-simple-migration.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, base64-bytestring
-, bytestring
-, cryptohash
-, directory
-, hspec
-, lib
-, postgresql-simple
-, text
-, time
+{ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+, directory, hspec, lib, postgresql-simple, text, time
 }:
 mkDerivation {
   pname = "postgresql-simple-migration";
@@ -20,23 +11,12 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    cryptohash
-    directory
-    postgresql-simple
-    time
+    base base64-bytestring bytestring cryptohash directory
+    postgresql-simple time
   ];
   executableHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    cryptohash
-    directory
-    postgresql-simple
-    text
-    time
+    base base64-bytestring bytestring cryptohash directory
+    postgresql-simple text time
   ];
   testHaskellDepends = [ base bytestring hspec postgresql-simple ];
   enableLibraryProfiling = true;
@@ -50,4 +30,4 @@ mkDerivation {
   description = "PostgreSQL Schema Migrations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/postgresql-simple.nix b/pkgs/postgresql-simple.nix
index 790a1c131bdfca684cb88db7bda9bd49362d1911..a24251f10e263c1e12d24a55307e3be996c672a4 100644
--- a/pkgs/postgresql-simple.nix
+++ b/pkgs/postgresql-simple.nix
@@ -1,77 +1,27 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "postgresql-simple";
-  version = "0.6.4";
-  sha256 = "6d90394203ea3aa27cae4492569ab14bf175cd2d30112e565ffb92dbe95ce267";
-  revision = "8";
-  editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8";
+  version = "0.6.5";
+  sha256 = "fda53ab2a72bbe402947526ccb02f9928563eae03e0832bb871c00912e455e96";
   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 bytestring-builder
+    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
-    cryptohash-md5
-    filepath
-    HUnit
-    inspection-testing
-    postgresql-libpq
-    tasty
-    tasty-golden
-    tasty-hunit
-    text
-    time-compat
-    vector
+    aeson base base16-bytestring bytestring case-insensitive containers
+    cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq
+    tasty tasty-golden tasty-hunit text time-compat vector
   ];
   benchmarkHaskellDepends = [ base vector ];
   enableLibraryProfiling = true;
@@ -84,4 +34,4 @@ mkDerivation {
   description = "Mid-Level PostgreSQL client library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pretty-simple.nix b/pkgs/pretty-simple.nix
index 6d26ed7fbb91e846161944862439e1bf2fc9bea5..9fb7a64fd1b306417a35f5ed0f045d27398ec638 100644
--- a/pkgs/pretty-simple.nix
+++ b/pkgs/pretty-simple.nix
@@ -1,45 +1,23 @@
-{ mkDerivation
-, Cabal
-, Glob
-, QuickCheck
-, base
-, cabal-doctest
-, containers
-, criterion
-, doctest
-, lib
-, mtl
-, optparse-applicative
-, prettyprinter
-, prettyprinter-ansi-terminal
-, template-haskell
-, text
-, transformers
+{ 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.1.0";
-  sha256 = "dae179b1a967e1d443f135e5b3f5abdf378e515fb8ea86e091bc487dc1a25d4a";
+  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
+    base containers mtl prettyprinter prettyprinter-ansi-terminal text
     transformers
   ];
   executableHaskellDepends = [ base optparse-applicative text ];
   testHaskellDepends = [
-    base
-    doctest
-    Glob
-    QuickCheck
-    template-haskell
+    base doctest Glob QuickCheck template-haskell
   ];
   benchmarkHaskellDepends = [ base criterion text ];
   enableLibraryProfiling = true;
@@ -53,4 +31,4 @@ mkDerivation {
   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/primitive-addr.nix b/pkgs/primitive-addr.nix
index 0ddd61e2b214bdcf76a0ce46fe21d57f94738fcc..d04926562a611287d359e0cc0e7e67066713c8f4 100644
--- a/pkgs/primitive-addr.nix
+++ b/pkgs/primitive-addr.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "primitive-addr";
   version = "0.1.0.2";
   sha256 = "4281c3a429bc03ab2940d072a6cbd63948bdf2607561456d972ba3ca4db9211b";
+  revision = "1";
+  editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +20,4 @@ mkDerivation {
   description = "Addresses to unmanaged memory";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/primitive-extras.nix b/pkgs/primitive-extras.nix
index d88af70bdba6d9e5c4a47573cf44f864cb46e0cc..418e7f1582115743ab970af87c286c0d5d6afa40 100644
--- a/pkgs/primitive-extras.nix
+++ b/pkgs/primitive-extras.nix
@@ -1,54 +1,22 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "primitive-extras";
-  version = "0.10.1.5";
-  sha256 = "5ae268716aa5beba45fe717e6f01f1b6c5ac13abc328805180496b8ad47eb176";
+  version = "0.10.1.6";
+  sha256 = "39036db6f3ecae0adc93b3c4b9a895d9a549e29052167ab44303c87e9d2fabd3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cereal
-    deferred-folds
-    focus
-    foldl
-    list-t
-    primitive
-    primitive-unlifted
-    profunctors
-    vector
+    base bytestring cereal deferred-folds focus foldl list-t primitive
+    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
+    quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +29,4 @@ mkDerivation {
   description = "Extras for the \"primitive\" library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/primitive-offset.nix b/pkgs/primitive-offset.nix
index 3af6ac97dc3d8dda63b8938434823b73da5ea91f..895be38390397b8e03377b2075dab5d910d443bc 100644
--- a/pkgs/primitive-offset.nix
+++ b/pkgs/primitive-offset.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Types for offsets into unboxed arrays";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/primitive-unlifted.nix b/pkgs/primitive-unlifted.nix
index a7f8afa7f364ec4b98bada6179a200dfa77cde2c..3db7bf84ab7617dbba5ef7f05ab4313a52294329 100644
--- a/pkgs/primitive-unlifted.nix
+++ b/pkgs/primitive-unlifted.nix
@@ -1,15 +1,11 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, primitive
-, stm
-, text-short
+{ mkDerivation, base, bytestring, lib, primitive, stm, text-short
 }:
 mkDerivation {
   pname = "primitive-unlifted";
   version = "0.1.3.1";
   sha256 = "8b330e1a7b146333344304334d67b60481535bb506f1e53500e2ef4bd9fb34be";
+  revision = "1";
+  editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -26,4 +22,4 @@ mkDerivation {
   description = "Primitive GHC types with unlifted types inside";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/primitive.nix b/pkgs/primitive.nix
index c24b6af3650dffefa9fc56201180c3283c826012..db17b1b57965bfe0e96054e1c8a4db5433c18868 100644
--- a/pkgs/primitive.nix
+++ b/pkgs/primitive.nix
@@ -1,49 +1,26 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-orphans
-, deepseq
-, ghc-prim
-, lib
-, quickcheck-classes-base
-, tagged
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, template-haskell
-, transformers
+{ mkDerivation, QuickCheck, base, base-orphans, deepseq, ghc-prim
+, lib, quickcheck-classes-base, tagged, tasty, tasty-bench
+, tasty-quickcheck, template-haskell, transformers
 , transformers-compat
 }:
 mkDerivation {
   pname = "primitive";
   version = "0.7.4.0";
   sha256 = "5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5";
+  revision = "1";
+  editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    template-haskell
-    transformers
+    base deepseq template-haskell transformers
   ];
   testHaskellDepends = [
-    base
-    base-orphans
-    ghc-prim
-    QuickCheck
-    quickcheck-classes-base
-    tagged
-    tasty
-    tasty-quickcheck
-    transformers
-    transformers-compat
+    base base-orphans ghc-prim QuickCheck quickcheck-classes-base
+    tagged tasty tasty-quickcheck transformers transformers-compat
   ];
   benchmarkHaskellDepends = [
-    base
-    deepseq
-    tasty-bench
-    transformers
+    base deepseq tasty-bench transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -56,4 +33,4 @@ mkDerivation {
   description = "Primitive memory-related operations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/proteaaudio-sdl.nix b/pkgs/proteaaudio-sdl.nix
index 0fa5c6a0cd10126e958e5868c510220afd6647bf..6ddca32d75e57c9a2928195b6506de8c51347f09 100644
--- a/pkgs/proteaaudio-sdl.nix
+++ b/pkgs/proteaaudio-sdl.nix
@@ -1,12 +1,14 @@
-{ mkDerivation, SDL2, base, bytestring, c2hs, lib }:
+{ mkDerivation, SDL2, base, bytestring, c2hs, lib
+, system-cxx-std-lib
+}:
 mkDerivation {
   pname = "proteaaudio-sdl";
-  version = "0.9.2";
-  sha256 = "8c65a869e7f9af19fc9f7a596b5f12f1551b9008a76b5b85460f304eb6cdc662";
+  version = "0.9.3";
+  sha256 = "57f99c2ca828fd820c618936f970cc70d9457de48ba4ed097531085494b0ee84";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base bytestring ];
+  libraryHaskellDepends = [ base bytestring system-cxx-std-lib ];
   librarySystemDepends = [ SDL2 ];
   libraryPkgconfigDepends = [ SDL2 ];
   libraryToolDepends = [ c2hs ];
@@ -20,4 +22,4 @@ mkDerivation {
   description = "Simple audio library for SDL";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/protolude.nix b/pkgs/protolude.nix
index bab75c318e5525269fb7fe182e90519fbaaccfdd..cab517190d8195bd357ea26501e671c7311c796b 100644
--- a/pkgs/protolude.nix
+++ b/pkgs/protolude.nix
@@ -1,42 +1,17 @@
-{ mkDerivation
-, array
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, ghc-prim
-, hashable
-, lib
-, mtl
-, mtl-compat
-, stm
-, text
-, transformers
+{ mkDerivation, array, async, base, bytestring, containers, deepseq
+, ghc-prim, hashable, lib, mtl, mtl-compat, stm, text, transformers
 , transformers-compat
 }:
 mkDerivation {
   pname = "protolude";
-  version = "0.3.2";
-  sha256 = "7ec019f3d445563a54fad8ba89564bffaae6028798a1cc3f033f5b425ef7a344";
+  version = "0.3.3";
+  sha256 = "6c39ded2c7e9f7b1a508e4400f0151cb325f4d80e35010c1d5afa58b48971a46";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-prim
-    hashable
-    mtl
-    mtl-compat
-    stm
-    text
-    transformers
-    transformers-compat
+    array async base bytestring containers deepseq ghc-prim hashable
+    mtl mtl-compat stm text transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +24,4 @@ mkDerivation {
   description = "A small prelude";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-dynamic.nix b/pkgs/quickcheck-dynamic.nix
index 0f80c860ee919c328d8d6d97dc39e32026429620..3d42e45a0f406b61241fb249ddeebf6500bbd295 100644
--- a/pkgs/quickcheck-dynamic.nix
+++ b/pkgs/quickcheck-dynamic.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, QuickCheck, base, lib, mtl, random }:
+{ mkDerivation, QuickCheck, base, containers, lib, mtl, random }:
 mkDerivation {
   pname = "quickcheck-dynamic";
-  version = "2.0.0";
-  sha256 = "78082446894d9522a1e9f9589f758fef2fcb7778d9427fe8ce1cedc156ea48ed";
+  version = "3.0.2";
+  sha256 = "1e02d4067495fdd7e13c99accc1efceebce6ff1408e617f1a56dbaa247d9e345";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base mtl QuickCheck random ];
+  libraryHaskellDepends = [ base containers mtl QuickCheck random ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -18,4 +18,4 @@ mkDerivation {
   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
index b05347631d3912340e0ed693a502866bd01bc2ef..177d68d54c67b4fa6671a36be3a985d3be658fd5 100644
--- a/pkgs/quickcheck-instances.nix
+++ b/pkgs/quickcheck-instances.nix
@@ -1,74 +1,28 @@
-{ 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, 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.28";
-  sha256 = "c4111b7b49d5814120cb6055705d04eda7dd32a536057167c646aa77b68ccccb";
+  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
+    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
+    base containers primitive QuickCheck tagged uuid-types
   ];
   benchmarkHaskellDepends = [ base bytestring QuickCheck ];
   enableLibraryProfiling = true;
@@ -82,4 +36,4 @@ mkDerivation {
   description = "Common quickcheck instances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ral.nix b/pkgs/ral.nix
index 5dc9b53c88d7e1aae860b0f4f315749b55ffbd9c..bc6e68deb953cbfb42ed26e669ff16c7df479a3d 100644
--- a/pkgs/ral.nix
+++ b/pkgs/ral.nix
@@ -1,36 +1,19 @@
-{ mkDerivation
-, QuickCheck
-, adjunctions
-, base
-, bin
-, criterion
-, deepseq
-, distributive
-, fin
-, hashable
-, lib
-, semigroupoids
-, vector
+{ mkDerivation, QuickCheck, adjunctions, base, bin, boring
+, criterion, deepseq, distributive, fin, hashable
+, indexed-traversable, lib, semigroupoids, vector
 }:
 mkDerivation {
   pname = "ral";
-  version = "0.1";
-  sha256 = "048cf2b5b394229503bdd748c93cc19650b4223d01e11e954b373f7595c21241";
-  revision = "2";
-  editedCabalFile = "0a3ryzcmjgyp64f8s2pl95pkz8zddq9qsn76dlimg23gczf1cql4";
+  version = "0.2.1";
+  sha256 = "510fa3a1293a5ff04f605aabafe65e6bdb1a15b085d173ed9bfda317909edab8";
+  revision = "1";
+  editedCabalFile = "12hvk5cz97ljnwa4y8c47hhfg8v1j7n3zqhb99cmrvgm58ar5j4q";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    base
-    bin
-    deepseq
-    distributive
-    fin
-    hashable
-    QuickCheck
-    semigroupoids
+    adjunctions base bin boring deepseq distributive fin hashable
+    indexed-traversable QuickCheck semigroupoids
   ];
   benchmarkHaskellDepends = [ base criterion vector ];
   enableLibraryProfiling = true;
@@ -44,4 +27,4 @@ mkDerivation {
   description = "Random access lists";
   license = lib.licenses.gpl2Plus;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rebase.nix b/pkgs/rebase.nix
index c19169eb927829ddf4d269f67a05e35696bd10bf..1e4ddaa74b7ab7430536eeafc07a1b1b93b06ad3 100644
--- a/pkgs/rebase.nix
+++ b/pkgs/rebase.nix
@@ -1,70 +1,21 @@
-{ mkDerivation
-, base
-, bifunctors
-, bytestring
-, comonad
-, containers
-, contravariant
-, deepseq
-, dlist
-, either
-, groups
-, hashable
-, invariant
-, lib
-, mtl
-, profunctors
-, scientific
-, selective
-, semigroupoids
-, stm
-, text
-, time
-, time-compat
-, transformers
-, unordered-containers
-, uuid-types
-, vector
-, vector-instances
-, void
+{ mkDerivation, base, bifunctors, bytestring, comonad, containers
+, contravariant, deepseq, dlist, either, groups, hashable
+, invariant, lib, mtl, profunctors, scientific, selective
+, semigroupoids, stm, text, time, time-compat, transformers
+, unordered-containers, uuid-types, vector, vector-instances, void
 }:
 mkDerivation {
   pname = "rebase";
-  version = "1.16";
-  sha256 = "0d76253ba464eee3363ff0ef4f0f470ca1711cd7acc907089b6eac15f8acad64";
-  revision = "1";
-  editedCabalFile = "048h2ir37j09s0z7fb364p7smyhzq6h4705qklhvylak9242gz2n";
+  version = "1.20";
+  sha256 = "9d1c7d60b71e56df3b1018ad9fd78cd20b9b81a96f6f00d16d06a7bc5f81239f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bifunctors
-    bytestring
-    comonad
-    containers
-    contravariant
-    deepseq
-    dlist
-    either
-    groups
-    hashable
-    invariant
-    mtl
-    profunctors
-    scientific
-    selective
-    semigroupoids
-    stm
-    text
-    time
-    time-compat
-    transformers
-    unordered-containers
-    uuid-types
-    vector
-    vector-instances
-    void
+    base bifunctors bytestring comonad containers contravariant deepseq
+    dlist either groups hashable invariant mtl profunctors scientific
+    selective semigroupoids stm text time time-compat transformers
+    unordered-containers uuid-types vector vector-instances void
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -77,4 +28,4 @@ mkDerivation {
   description = "A more progressive alternative to the \"base\" package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/recursion-schemes.nix b/pkgs/recursion-schemes.nix
index 0a51aa318ac6c4dc40cb81890a6c0a300d8f16b8..7a22e0689500ed2f49d1d6888629969dcaaed1f8 100644
--- a/pkgs/recursion-schemes.nix
+++ b/pkgs/recursion-schemes.nix
@@ -1,35 +1,19 @@
-{ mkDerivation
-, HUnit
-, base
-, base-orphans
-, comonad
-, containers
-, data-fix
-, free
-, lib
-, template-haskell
-, th-abstraction
+{ mkDerivation, HUnit, base, base-orphans, comonad, containers
+, data-fix, free, lib, template-haskell, th-abstraction
 , transformers
 }:
 mkDerivation {
   pname = "recursion-schemes";
-  version = "5.2.2.2";
-  sha256 = "66c3492a2fb10cea81348d0828c518b96b39f354d9e37d028a3fa279933c1405";
+  version = "5.2.2.4";
+  sha256 = "0c151bc90a9a28bab2beced0e450103e102f754ddfebb8f924fc8a3b11c4db43";
   revision = "1";
-  editedCabalFile = "1l6wbzx8804pb6p8gvk45hal6sz8r1gvyxb8aa9ih6j8pqv4q04c";
+  editedCabalFile = "1sb3pc1z40ss6rmiqifhcawiw1qdxc1mahcbwgfsfvpxlbmzlrrb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    comonad
-    containers
-    data-fix
-    free
-    template-haskell
-    th-abstraction
-    transformers
+    base base-orphans comonad containers data-fix free template-haskell
+    th-abstraction transformers
   ];
   testHaskellDepends = [ base HUnit template-haskell transformers ];
   enableLibraryProfiling = true;
@@ -43,4 +27,4 @@ mkDerivation {
   description = "Representing common recursion patterns as higher-order functions";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/recv.nix b/pkgs/recv.nix
new file mode 100644
index 0000000000000000000000000000000000000000..feab2cf0fff1da1a4c1aa1bfa3b2ea66b784b51f
--- /dev/null
+++ b/pkgs/recv.nix
@@ -0,0 +1,25 @@
+{ 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/reflection.nix b/pkgs/reflection.nix
index ee87d5b7ae29d61b6e8129365a244c427c712340..02e748adac8fba221ce872b63b004340844e2dce 100644
--- a/pkgs/reflection.nix
+++ b/pkgs/reflection.nix
@@ -1,18 +1,10 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, hspec
-, hspec-discover
-, lib
-, template-haskell
+{ mkDerivation, QuickCheck, base, containers, hspec, hspec-discover
+, lib, template-haskell
 }:
 mkDerivation {
   pname = "reflection";
-  version = "2.1.6";
-  sha256 = "bf3e14917ebb329a53701a3cce0afe670f20037a0148dbfa5cbfa574ed6ba6cd";
-  revision = "1";
-  editedCabalFile = "1bnpkfmagii4mc8258yjy4f4lykflmljkqcifnxpfqv99bszw6pl";
+  version = "2.1.7";
+  sha256 = "6cbb18a8b02871533bb8b641dc6f76813a097d94404e5808bb5d52b0f0e415fd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -30,4 +22,4 @@ mkDerivation {
   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/relude.nix b/pkgs/relude.nix
index fb5ff2ea1a9ba57a4c881487c076032823fa9390..de11e07186bdf9ef8c854e931aa53d956092af57 100644
--- a/pkgs/relude.nix
+++ b/pkgs/relude.nix
@@ -1,54 +1,23 @@
-{ mkDerivation
-, Glob
-, base
-, bytestring
-, containers
-, deepseq
-, doctest
-, ghc-prim
-, hashable
-, hedgehog
-, lib
-, mtl
-, stm
-, tasty-bench
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, Glob, base, bytestring, containers, deepseq
+, doctest, ghc-prim, hashable, hedgehog, lib, mtl, stm, tasty-bench
+, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "relude";
-  version = "1.1.0.0";
-  sha256 = "b51df08a93ef1331dd56389e158e67ac7b68c62cc1561c2890d3572c764ab609";
+  version = "1.2.0.0";
+  sha256 = "cbe177b3df1abf848704a1095f046af8006cb0e185151c00a19c8faa6f2c1273";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-prim
-    hashable
-    mtl
-    stm
-    text
-    transformers
-    unordered-containers
+    base bytestring containers deepseq ghc-prim hashable mtl stm text
+    transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    doctest
-    Glob
-    hedgehog
-    text
+    base bytestring containers doctest Glob hedgehog text
   ];
   benchmarkHaskellDepends = [
-    base
-    tasty-bench
-    unordered-containers
+    base tasty-bench unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +30,4 @@ mkDerivation {
   description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rerebase.nix b/pkgs/rerebase.nix
index 7ab3216d73d8e7f696896a7ad07bdc6a39b85883..0de979972bb9c78213e6ce8fae34fbe83a4b622d 100644
--- a/pkgs/rerebase.nix
+++ b/pkgs/rerebase.nix
@@ -1,8 +1,8 @@
 { mkDerivation, lib, rebase }:
 mkDerivation {
   pname = "rerebase";
-  version = "1.15.0.3";
-  sha256 = "a2b18cff71a2a67c0a956385134ac2b5bbe2379a17d6dbe66bb4c0d79bd6b44b";
+  version = "1.20";
+  sha256 = "f207ec83ccff1c6860e6276153ef618caf4e20de9ce098eae1a188ef355c9adc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Reexports from \"base\" with a bunch of other standard libraries";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/resource-pool.nix b/pkgs/resource-pool.nix
index 47dad73931092ea4d7b0a456602027b651be575a..1d620cdf273d9087272adfc87db2a908b100ca2b 100644
--- a/pkgs/resource-pool.nix
+++ b/pkgs/resource-pool.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, base, lib, primitive, time }:
+{ mkDerivation, base, hashable, lib, primitive, time }:
 mkDerivation {
   pname = "resource-pool";
-  version = "0.3.1.0";
-  sha256 = "fe14a0f90526ff5e1629ff6bf19025ebb18354352718abc7814095d001f58c4e";
+  version = "0.4.0.0";
+  sha256 = "8c0d783e3e75788d65f79157309132999f1bbb70684bacc2ea5dd18f904ae9b1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base primitive time ];
+  libraryHaskellDepends = [ base hashable primitive time ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = false;
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A high-performance striped resource pooling implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/saltine.nix b/pkgs/saltine.nix
index 8132809e22409c01a0f543a22883727b5c050ec5..d71b9f8a31bd1e0cfdf0dc7ace318109c11325eb 100644
--- a/pkgs/saltine.nix
+++ b/pkgs/saltine.nix
@@ -1,49 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, hashable
-, lib
-, libsodium
-, profunctors
-, semigroups
-, test-framework
-, test-framework-quickcheck2
-, text
+{ mkDerivation, QuickCheck, base, bytestring, criterion, deepseq
+, hashable, lib, libsodium, profunctors, semigroups, test-framework
+, test-framework-quickcheck2, text
 }:
 mkDerivation {
   pname = "saltine";
-  version = "0.2.0.1";
-  sha256 = "ce6867a08a308bc5155cb4c5a146837cf6c5e056dd0d0151f9f0838b2eed2ea0";
+  version = "0.2.1.0";
+  sha256 = "aa8b3d7af6ccf7930e403388782413111b6246206ad772dd982d83551f963cd9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    hashable
-    profunctors
-    text
+    base bytestring deepseq hashable profunctors text
   ];
   libraryPkgconfigDepends = [ libsodium ];
   testHaskellDepends = [
-    base
-    bytestring
-    QuickCheck
-    semigroups
-    test-framework
-    test-framework-quickcheck2
-    text
+    base bytestring QuickCheck semigroups test-framework
+    test-framework-quickcheck2 text
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    deepseq
-    text
+    base bytestring criterion deepseq text
   ];
   benchmarkSystemDepends = [ libsodium ];
   enableLibraryProfiling = true;
@@ -56,4 +31,4 @@ mkDerivation {
   description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sandwich.nix b/pkgs/sandwich.nix
index 954265b9b5de81255ffd8587aaca176226d76b72..d4cccad4cf743f8426c0e16187834b185759b339 100644
--- a/pkgs/sandwich.nix
+++ b/pkgs/sandwich.nix
@@ -1,158 +1,41 @@
-{ mkDerivation
-, aeson
-, ansi-terminal
-, async
-, base
-, brick
-, bytestring
-, colour
-, containers
-, 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
-, transformers
-, transformers-base
-, unix
-, unliftio-core
-, vector
-, vty
+{ mkDerivation, aeson, ansi-terminal, async, base, brick
+, bytestring, colour, containers, 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
+, transformers, transformers-base, unix, unliftio-core, vector, vty
 }:
 mkDerivation {
   pname = "sandwich";
-  version = "0.1.1.2";
-  sha256 = "b8b1dd82e8cc776ce35bba22d4285fe2ad50fb512f7555703f00f7b782608aba";
+  version = "0.1.3.0";
+  sha256 = "85f033c2c811ede03ef72d73ad1a7883511fa834db634bf8df1c36b9263c6f91";
   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
-    optparse-applicative
-    pretty-show
-    process
-    safe
-    safe-exceptions
-    stm
-    string-interpolate
-    template-haskell
-    text
-    time
-    transformers
-    transformers-base
-    unix
-    unliftio-core
-    vector
-    vty
+    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
+    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
-    optparse-applicative
-    pretty-show
-    process
-    safe
-    safe-exceptions
-    stm
-    string-interpolate
-    template-haskell
-    text
-    time
-    transformers
-    transformers-base
-    unix
-    unliftio-core
-    vector
-    vty
+    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
+    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
-    optparse-applicative
-    pretty-show
-    process
-    safe
-    safe-exceptions
-    stm
-    string-interpolate
-    template-haskell
-    text
-    time
-    transformers
-    transformers-base
-    unix
-    unliftio-core
-    vector
-    vty
+    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
+    optparse-applicative pretty-show process safe safe-exceptions stm
+    string-interpolate template-haskell text time transformers
+    transformers-base unix unliftio-core vector vty
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -165,4 +48,4 @@ mkDerivation {
   description = "Yet another test framework for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/scotty.nix b/pkgs/scotty.nix
index 4630115bc355949c44cf5c810814716ae4e0ea92..b5b408ccdc8348e16d69ead86ddac527c8412ea0 100644
--- a/pkgs/scotty.nix
+++ b/pkgs/scotty.nix
@@ -1,92 +1,30 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, base-compat-batteries
-, blaze-builder
-, bytestring
-, case-insensitive
-, data-default-class
-, directory
-, exceptions
-, fail
-, hspec
-, hspec-discover
-, hspec-wai
-, http-types
-, lib
-, lifted-base
-, lucid
-, monad-control
-, mtl
-, nats
-, network
-, regex-compat
-, text
-, transformers
-, transformers-base
-, transformers-compat
-, wai
-, wai-extra
-, warp
-, weigh
+{ 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 {
   pname = "scotty";
-  version = "0.12";
-  sha256 = "e1d77ee05eaa4b1871566b33683da9ab15dda8f7c42875701d62caf7db7defd2";
-  revision = "9";
-  editedCabalFile = "0d61dgx6wq682mz8ryq2a10v1z4yi0dik8b5psi0ragl2qip191j";
+  version = "0.12.1";
+  sha256 = "1e2a33ff37765d9e1de7fc7b8f20a75b91b008ada60c1e445df06c7fc614db4a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat-batteries
-    blaze-builder
-    bytestring
-    case-insensitive
-    data-default-class
-    exceptions
-    fail
-    http-types
-    monad-control
-    mtl
-    nats
-    network
-    regex-compat
-    text
-    transformers
-    transformers-base
-    transformers-compat
-    wai
-    wai-extra
-    warp
+    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
   ];
   testHaskellDepends = [
-    async
-    base
-    bytestring
-    data-default-class
-    directory
-    hspec
-    hspec-wai
-    http-types
-    lifted-base
-    network
-    text
-    wai
+    async base bytestring data-default-class directory hspec hspec-wai
+    http-types lifted-base network text wai
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    data-default-class
-    lucid
-    mtl
-    text
-    transformers
+    base bytestring data-default-class lucid mtl text transformers
     weigh
   ];
   enableLibraryProfiling = true;
@@ -100,4 +38,4 @@ mkDerivation {
   description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sdl2.nix b/pkgs/sdl2.nix
index bd46d3a9dde1023f1d9eb881ba8e0e9bb0edc664..30930dc6f9615862e5e196d946b0a0a6af95e60b 100644
--- a/pkgs/sdl2.nix
+++ b/pkgs/sdl2.nix
@@ -1,33 +1,17 @@
-{ mkDerivation
-, SDL2
-, StateVar
-, base
-, bytestring
-, deepseq
-, exceptions
-, lib
-, linear
-, text
-, transformers
-, vector
-, weigh
+{ mkDerivation, SDL2, StateVar, base, bytestring, deepseq
+, exceptions, lib, linear, text, transformers, vector, weigh
 }:
 mkDerivation {
   pname = "sdl2";
-  version = "2.5.3.3";
-  sha256 = "aa860444661daffc91ccc28a044bd15200f593443c601efe4f1872680f6f1ba8";
+  version = "2.5.4.0";
+  sha256 = "d5231b6fbf6d83f928168f05f6174b8776d8e97b55228dc8ec3391ef22bc65bc";
+  revision = "2";
+  editedCabalFile = "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    bytestring
-    exceptions
-    linear
-    StateVar
-    text
-    transformers
-    vector
+    base bytestring exceptions linear StateVar text transformers vector
   ];
   librarySystemDepends = [ SDL2 ];
   libraryPkgconfigDepends = [ SDL2 ];
@@ -42,4 +26,4 @@ mkDerivation {
   description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/selective.nix b/pkgs/selective.nix
index 78592b810651de65669635c1eb0efb6d3b6b1a33..aa221187868761a81db36fb0579b002a715e84be 100644
--- a/pkgs/selective.nix
+++ b/pkgs/selective.nix
@@ -1,8 +1,10 @@
 { mkDerivation, QuickCheck, base, containers, lib, transformers }:
 mkDerivation {
   pname = "selective";
-  version = "0.5";
-  sha256 = "b0fda80309a83d8f9eed9b8798b3c8c6626600154948323a8d80ab8e2c2f8da3";
+  version = "0.7";
+  sha256 = "cf1952b03aaa98db4706dbf57ed76b9fa46921fb71c2020d7ad59d721d741c36";
+  revision = "1";
+  editedCabalFile = "0ibky7kzs4rc0dz1m2116fb6q4ziwrb49vjbhfy6ns1qb205ag8f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +21,4 @@ mkDerivation {
   description = "Selective applicative functors";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/semialign.nix b/pkgs/semialign.nix
index 263183bf71c957abfe106159183addb48c1962cd..0872ceca72376ae43ecd19857054222dfb4c1996 100644
--- a/pkgs/semialign.nix
+++ b/pkgs/semialign.nix
@@ -1,38 +1,18 @@
-{ mkDerivation
-, base
-, containers
-, hashable
-, indexed-traversable
-, indexed-traversable-instances
-, lib
-, semigroupoids
-, tagged
-, these
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, base, containers, hashable, indexed-traversable
+, indexed-traversable-instances, lib, semigroupoids, tagged, these
+, transformers, unordered-containers, vector
 }:
 mkDerivation {
   pname = "semialign";
-  version = "1.2.0.1";
-  sha256 = "d900697041ae4b0cca3243273a2b3e80bcf74d937405d6a5ff34dc33ee952132";
-  revision = "3";
-  editedCabalFile = "0dbcdnksik508i12arh3s6bis6779lx5f1df0jkc0bp797inhd7f";
+  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
+    base containers hashable indexed-traversable
+    indexed-traversable-instances semigroupoids tagged these
+    transformers unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +25,4 @@ mkDerivation {
   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
index fec323e5b73c4a5849d6f2cccfa213bcf53c2ce3..c704acf32e91db2f03ec58a751be3538c5999951 100644
--- a/pkgs/semigroupoids.nix
+++ b/pkgs/semigroupoids.nix
@@ -1,40 +1,21 @@
-{ mkDerivation
-, base
-, base-orphans
-, bifunctors
-, comonad
-, containers
-, contravariant
-, distributive
-, hashable
-, lib
-, tagged
-, template-haskell
-, transformers
-, transformers-compat
+{ mkDerivation, base, base-orphans, bifunctors, comonad, containers
+, contravariant, distributive, hashable, lib, tagged
+, template-haskell, transformers, transformers-compat
 , unordered-containers
 }:
 mkDerivation {
   pname = "semigroupoids";
   version = "5.3.7";
   sha256 = "6d45cdb6c58c75ca588859b80b2c92b6f48590a03e065c24ce5d767a6a963799";
+  revision = "1";
+  editedCabalFile = "063xzbp4p93kbaygn26rzs4wmwf01mcj7d4qfsiwf39gd0wkf2dc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    bifunctors
-    comonad
-    containers
-    contravariant
-    distributive
-    hashable
-    tagged
-    template-haskell
-    transformers
-    transformers-compat
-    unordered-containers
+    base base-orphans bifunctors comonad containers contravariant
+    distributive hashable tagged template-haskell transformers
+    transformers-compat unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +28,4 @@ mkDerivation {
   description = "Semigroupoids: Category sans id";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-auth-client.nix b/pkgs/servant-auth-client.nix
index 71e6fbf4629b0e430ee5c3e324c45f5dd7768482..c1347f65e8d107a91ef170b39c4486e2cfc5a55c 100644
--- a/pkgs/servant-auth-client.nix
+++ b/pkgs/servant-auth-client.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, containers
-, hspec
-, hspec-discover
-, http-client
-, http-types
-, jose
-, lib
-, servant
-, servant-auth
-, servant-auth-server
-, servant-client
-, servant-client-core
-, servant-server
-, time
-, transformers
-, wai
+{ mkDerivation, QuickCheck, aeson, base, bytestring, containers
+, hspec, hspec-discover, http-client, http-types, jose, lib
+, servant, servant-auth, servant-auth-server, servant-client
+, servant-client-core, servant-server, time, transformers, wai
 , warp
 }:
 mkDerivation {
@@ -31,31 +14,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    servant
-    servant-auth
-    servant-client-core
+    base bytestring containers servant servant-auth servant-client-core
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    hspec
-    http-client
-    http-types
-    jose
-    QuickCheck
-    servant
-    servant-auth
-    servant-auth-server
-    servant-client
-    servant-server
-    time
-    transformers
-    wai
-    warp
+    aeson base bytestring hspec http-client http-types jose QuickCheck
+    servant servant-auth servant-auth-server servant-client
+    servant-server time transformers wai warp
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -69,4 +33,4 @@ mkDerivation {
   description = "servant-client/servant-auth compatibility";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index 582dddfd79eec490bcc5efc0fc0856a11a77c168..4724215cb927abb06660917eebf5c4175565f2a9 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -1,37 +1,9 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, case-insensitive
-, cookie
-, data-default-class
-, entropy
-, hspec
-, hspec-discover
-, http-client
-, http-types
-, jose
-, lens
-, lens-aeson
-, lib
-, markdown-unlit
-, memory
-, monad-time
-, mtl
-, servant
-, servant-auth
-, servant-server
-, tagged
-, text
-, time
-, transformers
-, unordered-containers
-, wai
-, warp
-, wreq
+{ mkDerivation, QuickCheck, aeson, base, base64-bytestring
+, blaze-builder, bytestring, case-insensitive, cookie
+, data-default-class, entropy, hspec, hspec-discover, http-client
+, http-types, jose, lens, lens-aeson, lib, markdown-unlit, memory
+, monad-time, mtl, servant, servant-auth, servant-server, tagged
+, text, time, transformers, unordered-containers, wai, warp, wreq
 }:
 mkDerivation {
   pname = "servant-auth-server";
@@ -43,51 +15,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    case-insensitive
-    cookie
-    data-default-class
-    entropy
-    http-types
-    jose
-    lens
-    memory
-    monad-time
-    mtl
-    servant
-    servant-auth
-    servant-server
-    tagged
-    text
-    time
-    unordered-containers
-    wai
+    aeson base base64-bytestring blaze-builder bytestring
+    case-insensitive cookie data-default-class entropy http-types jose
+    lens memory monad-time mtl servant servant-auth servant-server
+    tagged text time unordered-containers wai
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    case-insensitive
-    hspec
-    http-client
-    http-types
-    jose
-    lens
-    lens-aeson
-    mtl
-    QuickCheck
-    servant
-    servant-auth
-    servant-server
-    time
-    transformers
-    wai
-    warp
-    wreq
+    aeson base bytestring case-insensitive hspec http-client http-types
+    jose lens lens-aeson mtl QuickCheck servant servant-auth
+    servant-server time transformers wai warp wreq
   ];
   testToolDepends = [ hspec-discover markdown-unlit ];
   enableLibraryProfiling = true;
@@ -101,4 +37,4 @@ mkDerivation {
   description = "servant-server/servant-auth compatibility";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-auth.nix b/pkgs/servant-auth.nix
index bf2f35530789d0898a2c51d459a6aedf9a7754ca..d064ed651769e1b19b2a6187dab6074790c7d427 100644
--- a/pkgs/servant-auth.nix
+++ b/pkgs/servant-auth.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, jose
-, lens
-, lib
-, servant
-, text
-, unordered-containers
+{ mkDerivation, aeson, base, containers, jose, lens, lib, servant
+, text, unordered-containers
 }:
 mkDerivation {
   pname = "servant-auth";
@@ -19,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    jose
-    lens
-    servant
-    text
-    unordered-containers
+    aeson base containers jose lens servant text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Authentication combinators for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-blaze.nix b/pkgs/servant-blaze.nix
index 14b5040535e7a4a592904461c88810f67b6d1051..c4ae209d000e5c72af25022482f3a5203e7278a9 100644
--- a/pkgs/servant-blaze.nix
+++ b/pkgs/servant-blaze.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, blaze-html
-, http-media
-, lib
-, servant
-, servant-server
-, wai
-, warp
+{ mkDerivation, base, blaze-html, http-media, lib, servant
+, servant-server, wai, warp
 }:
 mkDerivation {
   pname = "servant-blaze";
@@ -30,4 +23,4 @@ mkDerivation {
   description = "Blaze-html support for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index a223db82026bca6f8faabbac7f8e4e639bf7a3e1..d384049c2896131896022229bad3d06431572258 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -1,28 +1,8 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "servant-client-core";
@@ -38,24 +18,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat
-    base64-bytestring
-    bytestring
-    constraints
-    containers
-    deepseq
-    exceptions
-    free
-    http-media
-    http-types
-    network-uri
-    safe
-    servant
-    sop-core
-    template-haskell
-    text
+    aeson base base-compat base64-bytestring bytestring constraints
+    containers deepseq exceptions free http-media http-types
+    network-uri safe servant sop-core template-haskell text
     transformers
   ];
   testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
@@ -71,4 +36,4 @@ mkDerivation {
   description = "Core functionality and class for client function generation for servant APIs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index bba1ef9185de05680bc1038f5859fd3be23eda2e..a09f1cd589dd81d1a796fd537a456f08cb20a6ae 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -1,41 +1,10 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, base
-, base-compat
-, bytestring
-, containers
-, deepseq
-, entropy
-, exceptions
-, fetchgit
-, 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
-, tdigest
-, text
-, time
-, transformers
-, transformers-base
-, transformers-compat
-, wai
-, warp
+{ mkDerivation, HUnit, QuickCheck, aeson, base, base-compat
+, bytestring, containers, deepseq, entropy, exceptions, fetchgit
+, 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, tdigest, text, time, transformers
+, transformers-base, transformers-compat, wai, warp
 }:
 mkDerivation {
   pname = "servant-client";
@@ -51,55 +20,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    containers
-    deepseq
-    exceptions
-    http-client
-    http-media
-    http-types
-    kan-extensions
-    monad-control
-    mtl
-    semigroupoids
-    servant
-    servant-client-core
-    stm
-    text
-    time
-    transformers
-    transformers-base
-    transformers-compat
+    base base-compat bytestring containers deepseq exceptions
+    http-client http-media http-types kan-extensions monad-control mtl
+    semigroupoids servant servant-client-core stm text time
+    transformers transformers-base transformers-compat
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    bytestring
-    entropy
-    hspec
-    http-api-data
-    http-client
-    http-types
-    HUnit
-    kan-extensions
-    markdown-unlit
-    mtl
-    network
-    QuickCheck
-    servant
-    servant-client-core
-    servant-server
-    sop-core
-    stm
-    tdigest
-    text
-    transformers
-    transformers-compat
-    wai
-    warp
+    aeson base base-compat bytestring entropy hspec http-api-data
+    http-client http-types HUnit kan-extensions markdown-unlit mtl
+    network QuickCheck servant servant-client-core servant-server
+    sop-core stm tdigest text transformers transformers-compat wai warp
   ];
   testToolDepends = [ hspec-discover markdown-unlit ];
   enableLibraryProfiling = true;
@@ -113,4 +43,4 @@ mkDerivation {
   description = "Automatic derivation of querying functions for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-docs.nix b/pkgs/servant-docs.nix
index 7e6e7a55a4f81479f1a002b589832db82f543a3f..463943bcfba4fdca55939aaa6dbf935cbee50235 100644
--- a/pkgs/servant-docs.nix
+++ b/pkgs/servant-docs.nix
@@ -1,70 +1,28 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, base
-, base-compat
-, bytestring
-, case-insensitive
-, hashable
-, http-media
-, http-types
-, lens
-, lib
-, servant
-, string-conversions
-, tasty
-, tasty-golden
-, tasty-hunit
-, text
-, transformers
-, universe-base
-, unordered-containers
+{ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+, case-insensitive, hashable, http-media, http-types, lens, lib
+, servant, string-conversions, tasty, tasty-golden, tasty-hunit
+, text, transformers, universe-base, unordered-containers
 }:
 mkDerivation {
   pname = "servant-docs";
   version = "0.12";
   sha256 = "632475d906e823325b01230453c2a357afa916b2410365290e5497811b956114";
-  revision = "3";
-  editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz";
+  revision = "5";
+  editedCabalFile = "191kb72gzyxr6w2a56775hhlckyg6ll9sasay7qqqg7mg7yvlfpn";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base-compat
-    bytestring
-    case-insensitive
-    hashable
-    http-media
-    http-types
-    lens
-    servant
-    string-conversions
-    text
-    universe-base
-    unordered-containers
+    aeson aeson-pretty base base-compat bytestring case-insensitive
+    hashable http-media http-types lens servant string-conversions text
+    universe-base unordered-containers
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    lens
-    servant
-    string-conversions
-    text
+    aeson base lens servant string-conversions text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    lens
-    servant
-    string-conversions
-    tasty
-    tasty-golden
-    tasty-hunit
-    transformers
+    aeson base base-compat lens servant string-conversions tasty
+    tasty-golden tasty-hunit transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -77,4 +35,4 @@ mkDerivation {
   description = "generate API docs for your servant webservice";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-effectful.nix b/pkgs/servant-effectful.nix
index 33be7bf0b1091dbdbe3eb3061de2f9db2f9ff5b7..be8e699f7bc3ec3165c16895614d4a47e407fbc6 100644
--- a/pkgs/servant-effectful.nix
+++ b/pkgs/servant-effectful.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, effectful-core
-, fetchgit
-, hashable
-, lib
-, mtl
-, servant
-, servant-server
-, tasty
-, tasty-hunit
-, wai
-, warp
+{ mkDerivation, base, effectful-core, fetchgit, hashable, lib, mtl
+, servant, servant-server, tasty, tasty-hunit, wai, warp
 }:
 mkDerivation {
   pname = "servant-effectful";
@@ -25,22 +14,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    effectful-core
-    hashable
-    mtl
-    servant
-    servant-server
-    wai
-    warp
+    base effectful-core hashable mtl servant servant-server wai warp
   ];
   testHaskellDepends = [
-    base
-    effectful-core
-    hashable
-    servant
-    servant-server
-    tasty
+    base effectful-core hashable servant servant-server tasty
     tasty-hunit
   ];
   enableLibraryProfiling = true;
@@ -53,4 +30,4 @@ mkDerivation {
   homepage = "https://github.com/haskell-effectful/servant-effectful/tree/main/servant-effectful#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index 3fa540eeadb39223f764e4c38bebbe50e51202f7..3fbb7c57732e12bd67b1c05d1ec6da436a1cef3b 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, base-compat
-, fetchgit
-, hspec
-, hspec-discover
-, http-types
-, lens
-, lib
-, servant
-, text
+{ mkDerivation, base, base-compat, fetchgit, hspec, hspec-discover
+, http-types, lens, lib, servant, text
 }:
 mkDerivation {
   pname = "servant-foreign";
@@ -24,12 +15,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    http-types
-    lens
-    servant
-    text
+    base base-compat http-types lens servant text
   ];
   testHaskellDepends = [ base hspec servant ];
   testToolDepends = [ hspec-discover ];
@@ -44,4 +30,4 @@ mkDerivation {
   description = "Helpers for generating clients for servant APIs in any programming language";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-lucid.nix b/pkgs/servant-lucid.nix
index f1d49d3d6bb6944a273c2a6838b1fd9d91e586b9..0a84cb13d39993cc1a0bf3073b1ee3ebafe28659 100644
--- a/pkgs/servant-lucid.nix
+++ b/pkgs/servant-lucid.nix
@@ -1,18 +1,10 @@
-{ mkDerivation
-, base
-, http-media
-, lib
-, lucid
-, servant
-, servant-server
-, text
-, wai
-, warp
+{ mkDerivation, base, http-media, lib, lucid, servant
+, servant-server, text, wai, warp
 }:
 mkDerivation {
   pname = "servant-lucid";
-  version = "0.9.0.5";
-  sha256 = "df55d4cb266bb95f31f658bef0e13c17a7b16e13068cc9931160620885911d7a";
+  version = "0.9.0.6";
+  sha256 = "a03973035722f9aee7a67fcbb6f44a2d515284e21b0bbf236fda3207132709fd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -29,4 +21,4 @@ mkDerivation {
   description = "Servant support for lucid";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-multipart-api.nix b/pkgs/servant-multipart-api.nix
index f8fd94fa264003023d6a9856e5a4efb97ea7771d..4c0f3eb15a83f8e73298a4bc11ee12d84e67ef89 100644
--- a/pkgs/servant-multipart-api.nix
+++ b/pkgs/servant-multipart-api.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, servant
-, text
-, transformers
+{ mkDerivation, base, bytestring, lib, servant, text, transformers
 }:
 mkDerivation {
   pname = "servant-multipart-api";
@@ -16,11 +10,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    servant
-    text
-    transformers
+    base bytestring servant text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "multipart/form-data (e.g file upload) support for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-multipart.nix b/pkgs/servant-multipart.nix
index 3a01c59855a8e4141b56f41dc1a9dfb362c4e07d..50d6f97d9218306aafd52f13743df79f3e9b8b18 100644
--- a/pkgs/servant-multipart.nix
+++ b/pkgs/servant-multipart.nix
@@ -1,22 +1,7 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, http-types
-, lens
-, lib
-, resourcet
-, servant
-, servant-docs
-, servant-foreign
-, servant-multipart-api
-, servant-server
-, string-conversions
-, tasty
-, tasty-wai
-, text
-, wai
-, wai-extra
+{ mkDerivation, base, bytestring, directory, http-types, lens, lib
+, resourcet, servant, servant-docs, servant-foreign
+, servant-multipart-api, servant-server, string-conversions, tasty
+, tasty-wai, text, wai, wai-extra
 }:
 mkDerivation {
   pname = "servant-multipart";
@@ -28,30 +13,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    lens
-    resourcet
-    servant
-    servant-docs
-    servant-foreign
-    servant-multipart-api
-    servant-server
-    string-conversions
-    text
-    wai
-    wai-extra
+    base bytestring directory lens resourcet servant servant-docs
+    servant-foreign servant-multipart-api servant-server
+    string-conversions text wai wai-extra
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    http-types
-    servant-server
-    string-conversions
-    tasty
-    tasty-wai
-    text
+    base bytestring http-types servant-server string-conversions tasty
+    tasty-wai text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -64,4 +32,4 @@ mkDerivation {
   description = "multipart/form-data (e.g file upload) support for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-openapi3.nix b/pkgs/servant-openapi3.nix
index 79a3110e5024ec5034e5dd188b01c57d21bfde8f..3b24f9b5ba514dcb37de366eb9cfa8426fa9d544 100644
--- a/pkgs/servant-openapi3.nix
+++ b/pkgs/servant-openapi3.nix
@@ -1,77 +1,29 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, aeson
-, aeson-pretty
-, base
-, base-compat
-, bytestring
-, cabal-doctest
-, directory
-, doctest
-, filepath
-, hspec
-, hspec-discover
-, http-media
-, insert-ordered-containers
-, lens
-, lens-aeson
-, lib
-, openapi3
-, servant
-, singleton-bool
-, template-haskell
-, text
-, time
-, unordered-containers
-, utf8-string
-, vector
+{ mkDerivation, Cabal, QuickCheck, aeson, aeson-pretty, base
+, base-compat, bytestring, cabal-doctest, directory, doctest
+, filepath, hspec, hspec-discover, http-media
+, insert-ordered-containers, lens, lens-aeson, lib, openapi3
+, servant, singleton-bool, template-haskell, text, time
+, unordered-containers, utf8-string, vector
 }:
 mkDerivation {
   pname = "servant-openapi3";
-  version = "2.0.1.5";
-  sha256 = "5e39a8b5504dddeb8f56f07623366c7fab9df646202033c898be2d48d4c39e7d";
-  revision = "3";
-  editedCabalFile = "0xvs5a9zsg32iziznvvjhfji577xmza419xk0cy1hwamw17f43mi";
+  version = "2.0.1.6";
+  sha256 = "322a2181fb2becb20b80ad8319dd3ce1874d89cd344a8d8a4e17d1428d1dbfc3";
+  revision = "2";
+  editedCabalFile = "0i7brbai4dd2f2jxi1b5i824iiq5nm932zkcp6gzfxiva82m1f4f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base-compat
-    bytestring
-    hspec
-    http-media
-    insert-ordered-containers
-    lens
-    openapi3
-    QuickCheck
-    servant
-    singleton-bool
-    text
-    unordered-containers
+    aeson aeson-pretty base base-compat bytestring hspec http-media
+    insert-ordered-containers lens openapi3 QuickCheck servant
+    singleton-bool text unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    directory
-    doctest
-    filepath
-    hspec
-    lens
-    lens-aeson
-    openapi3
-    QuickCheck
-    servant
-    template-haskell
-    text
-    time
-    utf8-string
-    vector
+    aeson base base-compat directory doctest filepath hspec lens
+    lens-aeson openapi3 QuickCheck servant template-haskell text time
+    utf8-string vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -85,4 +37,4 @@ mkDerivation {
   description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-polysemy.nix b/pkgs/servant-polysemy.nix
index 48df5619d20a4c9ab62019cb46abe3ed2a5b2443..ab0cbdb6bbfac50e140c0d881d660ee0fd7a2bf8 100644
--- a/pkgs/servant-polysemy.nix
+++ b/pkgs/servant-polysemy.nix
@@ -1,64 +1,23 @@
-{ mkDerivation
-, base
-, deepseq
-, http-client
-, http-client-tls
-, lens
-, lib
-, mtl
-, polysemy
-, polysemy-plugin
-, polysemy-zoo
-, servant
-, servant-client
-, servant-server
-, servant-swagger
-, servant-swagger-ui
-, swagger2
-, text
-, wai
-, warp
+{ mkDerivation, base, deepseq, http-client, http-client-tls, lens
+, lib, mtl, polysemy, polysemy-plugin, polysemy-zoo, servant
+, servant-client, servant-server, servant-swagger
+, servant-swagger-ui, swagger2, text, wai, warp
 }:
 mkDerivation {
   pname = "servant-polysemy";
-  version = "0.1.3";
-  sha256 = "11a10a26a55962dc36518ca8d1b0d21d29a6bf9bdceb54d0988642709d715e8c";
+  version = "0.1.4";
+  sha256 = "c21a40664812c05ae087c5ec5252ad4811086c3ca75b4b41d3e96e19fd50351f";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    http-client
-    http-client-tls
-    mtl
-    polysemy
-    polysemy-plugin
-    polysemy-zoo
-    servant-client
-    servant-server
-    wai
-    warp
+    base deepseq http-client http-client-tls mtl polysemy
+    polysemy-plugin polysemy-zoo servant-client servant-server wai warp
   ];
   executableHaskellDepends = [
-    base
-    deepseq
-    http-client
-    http-client-tls
-    lens
-    mtl
-    polysemy
-    polysemy-plugin
-    polysemy-zoo
-    servant
-    servant-client
-    servant-server
-    servant-swagger
-    servant-swagger-ui
-    swagger2
-    text
-    wai
-    warp
+    base deepseq http-client http-client-tls lens mtl polysemy
+    polysemy-plugin polysemy-zoo servant servant-client servant-server
+    servant-swagger servant-swagger-ui swagger2 text wai warp
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -71,4 +30,4 @@ mkDerivation {
   description = "Utilities for using servant in a polysemy stack";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index d649b4d2e9720a8787611c0a164e5258b2610172..f95d7df280d4140b62a50ac1bf3d0822b1cae6a8 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -1,44 +1,11 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base-compat
-, base64-bytestring
-, bytestring
-, constraints
-, containers
-, directory
-, exceptions
-, fetchgit
-, 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
-, temporary
-, text
-, transformers
-, transformers-base
-, transformers-compat
-, wai
-, wai-app-static
-, wai-extra
-, warp
-, word8
+{ mkDerivation, QuickCheck, aeson, base, base-compat
+, base64-bytestring, bytestring, constraints, containers, directory
+, exceptions, fetchgit, 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
+, temporary, text, transformers, transformers-base
+, transformers-compat, wai, wai-app-static, wai-extra, warp, word8
 }:
 mkDerivation {
   pname = "servant-server";
@@ -54,66 +21,20 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    base64-bytestring
-    bytestring
-    constraints
-    containers
-    exceptions
-    filepath
-    http-api-data
-    http-media
-    http-types
-    monad-control
-    mtl
-    network
-    network-uri
-    resourcet
-    servant
-    sop-core
-    string-conversions
-    tagged
-    text
-    transformers
-    transformers-base
-    wai
-    wai-app-static
-    word8
+    base base-compat base64-bytestring bytestring constraints
+    containers exceptions filepath http-api-data http-media http-types
+    monad-control mtl network network-uri resourcet servant sop-core
+    string-conversions tagged text transformers transformers-base wai
+    wai-app-static word8
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    base-compat
-    servant
-    text
-    wai
-    warp
+    aeson base base-compat servant text wai warp
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    base64-bytestring
-    bytestring
-    directory
-    hspec
-    hspec-wai
-    http-types
-    mtl
-    QuickCheck
-    resourcet
-    safe
-    servant
-    should-not-typecheck
-    sop-core
-    string-conversions
-    temporary
-    text
-    transformers
-    transformers-compat
-    wai
-    wai-extra
+    aeson base base-compat base64-bytestring bytestring directory hspec
+    hspec-wai http-types mtl QuickCheck resourcet safe servant
+    should-not-typecheck sop-core string-conversions temporary text
+    transformers transformers-compat wai wai-extra
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -127,4 +48,4 @@ mkDerivation {
   description = "A family of combinators for defining webservices APIs and serving them";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-static-th.nix b/pkgs/servant-static-th.nix
index a756a209e86d8c453655f4df4c81fcc6661d45a1..d5ac9bd8fd12f918268eae3fd258e2452a3ba016 100644
--- a/pkgs/servant-static-th.nix
+++ b/pkgs/servant-static-th.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, Glob
-, base
-, blaze-html
-, bytestring
-, containers
-, directory
-, doctest
-, filepath
-, hspec-wai
-, http-media
-, lib
-, semigroups
-, servant
-, servant-blaze
-, servant-server
-, tasty
-, tasty-hspec
-, tasty-hunit
-, template-haskell
-, text
-, wai
+{ mkDerivation, Glob, base, blaze-html, bytestring, containers
+, directory, doctest, filepath, hspec-wai, http-media, lib
+, semigroups, servant, servant-blaze, servant-server, tasty
+, tasty-hspec, tasty-hunit, template-haskell, text, wai
 }:
 mkDerivation {
   pname = "servant-static-th";
@@ -29,36 +11,14 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-html
-    bytestring
-    containers
-    directory
-    filepath
-    http-media
-    semigroups
-    servant
-    servant-blaze
-    servant-server
-    template-haskell
+    base blaze-html bytestring containers directory filepath http-media
+    semigroups servant servant-blaze servant-server template-haskell
     text
   ];
   testHaskellDepends = [
-    base
-    blaze-html
-    bytestring
-    directory
-    doctest
-    filepath
-    Glob
-    hspec-wai
-    servant
-    servant-blaze
-    servant-server
-    tasty
-    tasty-hspec
-    tasty-hunit
-    wai
+    base blaze-html bytestring directory doctest filepath Glob
+    hspec-wai servant servant-blaze servant-server tasty tasty-hspec
+    tasty-hunit wai
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -71,4 +31,4 @@ mkDerivation {
   description = "Embed a directory of static files in your Servant server";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-swagger-ui-core.nix b/pkgs/servant-swagger-ui-core.nix
index 29b52f12ea9a197d0584068bcdf09364f474af80..1583c2583b13953e5b2b57c4d8ea75bfca3520b5 100644
--- a/pkgs/servant-swagger-ui-core.nix
+++ b/pkgs/servant-swagger-ui-core.nix
@@ -1,40 +1,19 @@
-{ mkDerivation
-, aeson
-, base
-, blaze-markup
-, bytestring
-, http-media
-, lib
-, servant
-, servant-blaze
-, servant-server
-, text
-, transformers
-, transformers-compat
-, wai-app-static
+{ mkDerivation, aeson, base, blaze-markup, bytestring, http-media
+, lib, servant, servant-blaze, servant-server, text, transformers
+, transformers-compat, wai-app-static
 }:
 mkDerivation {
   pname = "servant-swagger-ui-core";
   version = "0.3.5";
   sha256 = "ed0bf0b2fbdb1751350df6780335de00ae08dd90ac4728a88369f4b132cf7b32";
-  revision = "5";
-  editedCabalFile = "1v80wydj605b1la1pa5b4l6c3ba86x2dlpnravvhmx32mkkxk7v2";
+  revision = "6";
+  editedCabalFile = "1lksxaxmw9ylimfkfcnqchrpqhmykhxa294kd2bwl1qs1rvyslfb";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    blaze-markup
-    bytestring
-    http-media
-    servant
-    servant-blaze
-    servant-server
-    text
-    transformers
-    transformers-compat
-    wai-app-static
+    aeson base blaze-markup bytestring http-media servant servant-blaze
+    servant-server text transformers transformers-compat wai-app-static
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Servant swagger ui core components";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-swagger-ui.nix b/pkgs/servant-swagger-ui.nix
index 3ed3b10faa09d847c1e240e59e4ac0262fee811a..cba61fad3f9234aeb3b4532732c2e848ce2f7425 100644
--- a/pkgs/servant-swagger-ui.nix
+++ b/pkgs/servant-swagger-ui.nix
@@ -1,32 +1,18 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, file-embed-lzma
-, lib
-, servant
-, servant-server
-, servant-swagger-ui-core
-, text
+{ mkDerivation, aeson, base, bytestring, file-embed-lzma, lib
+, servant, servant-server, servant-swagger-ui-core, text
 }:
 mkDerivation {
   pname = "servant-swagger-ui";
   version = "0.3.5.4.5.0";
   sha256 = "efa528edc055dc6c9e83dfdfe4b892be439bbcfb83a73847f6cfdb35c42f878b";
-  revision = "3";
-  editedCabalFile = "0qspb55lvavfsyqjjjyyax9gqzp8yq9r13nvzj3qnsipjgw2irln";
+  revision = "4";
+  editedCabalFile = "0nxyp77vqmwd7br5ag0zwc0rjwkxcriqcbfbg9cvlfdkp5d26wsp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    file-embed-lzma
-    servant
-    servant-server
-    servant-swagger-ui-core
-    text
+    aeson base bytestring file-embed-lzma servant servant-server
+    servant-swagger-ui-core text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +25,4 @@ mkDerivation {
   description = "Servant swagger ui";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-swagger.nix b/pkgs/servant-swagger.nix
index cdfb57b2e9c6502937d6bf1b9e3d34f3cbe0a654..fcda411e80d67f76b3c95ded4293724d1af52728 100644
--- a/pkgs/servant-swagger.nix
+++ b/pkgs/servant-swagger.nix
@@ -1,75 +1,29 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, aeson
-, aeson-pretty
-, base
-, base-compat
-, bytestring
-, cabal-doctest
-, directory
-, doctest
-, filepath
-, hspec
-, hspec-discover
-, http-media
-, insert-ordered-containers
-, lens
-, lens-aeson
-, lib
-, servant
-, singleton-bool
-, swagger2
-, template-haskell
-, text
-, time
-, unordered-containers
-, utf8-string
-, vector
+{ mkDerivation, Cabal, QuickCheck, aeson, aeson-pretty, base
+, base-compat, bytestring, cabal-doctest, directory, doctest
+, filepath, hspec, hspec-discover, http-media
+, insert-ordered-containers, lens, lens-aeson, lib, servant
+, singleton-bool, swagger2, template-haskell, text, time
+, unordered-containers, utf8-string, vector
 }:
 mkDerivation {
   pname = "servant-swagger";
   version = "1.1.11";
   sha256 = "f4b985007ab0520c177f8dcf7bfabf8cc88d480e087db5ea5b1d311c079676cf";
+  revision = "1";
+  editedCabalFile = "0g2hcf4zrkg8cailad87f3kiv1pnnyw453h9cslwc6kyfx9m3csn";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base-compat
-    bytestring
-    hspec
-    http-media
-    insert-ordered-containers
-    lens
-    QuickCheck
-    servant
-    singleton-bool
-    swagger2
-    text
-    unordered-containers
+    aeson aeson-pretty base base-compat bytestring hspec http-media
+    insert-ordered-containers lens QuickCheck servant singleton-bool
+    swagger2 text unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    directory
-    doctest
-    filepath
-    hspec
-    lens
-    lens-aeson
-    QuickCheck
-    servant
-    swagger2
-    template-haskell
-    text
-    time
-    utf8-string
-    vector
+    aeson base base-compat directory doctest filepath hspec lens
+    lens-aeson QuickCheck servant swagger2 template-haskell text time
+    utf8-string vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -83,4 +37,4 @@ mkDerivation {
   description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-websockets.nix b/pkgs/servant-websockets.nix
index 640457badae907e359cbc1e30de8312db5ff7de6..50f70cc1a709763cd3cd074a62d871df0aa59253 100644
--- a/pkgs/servant-websockets.nix
+++ b/pkgs/servant-websockets.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, bytestring
-, conduit
-, exceptions
-, lib
-, monad-control
-, resourcet
-, servant-server
-, text
-, wai
-, wai-websockets
-, warp
-, websockets
+{ mkDerivation, aeson, async, base, bytestring, conduit, exceptions
+, lib, monad-control, resourcet, servant-server, text, wai
+, wai-websockets, warp, websockets
 }:
 mkDerivation {
   pname = "servant-websockets";
@@ -23,30 +10,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    bytestring
-    conduit
-    exceptions
-    monad-control
-    resourcet
-    servant-server
-    text
-    wai
-    wai-websockets
-    warp
-    websockets
+    aeson async base bytestring conduit exceptions monad-control
+    resourcet servant-server text wai wai-websockets warp websockets
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    conduit
-    servant-server
-    text
-    wai
-    warp
-    websockets
+    aeson base conduit servant-server text wai warp websockets
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +27,4 @@ mkDerivation {
   description = "Small library providing WebSocket endpoints for servant";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 2e62c8ae235074dcbf8d36726f9a30f0642ca963..7d2146bcfc37929e2ebb85178eb155edf6c3e56a 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -1,32 +1,9 @@
-{ 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
+{ 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
 }:
 mkDerivation {
   pname = "servant";
@@ -42,43 +19,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base-compat
-    bifunctors
-    bytestring
-    case-insensitive
-    constraints
-    deepseq
-    http-api-data
-    http-media
-    http-types
-    mmorph
-    mtl
-    network-uri
-    QuickCheck
-    singleton-bool
-    sop-core
-    string-conversions
-    tagged
-    text
-    transformers
-    vault
+    aeson attoparsec base base-compat bifunctors bytestring
+    case-insensitive constraints deepseq http-api-data http-media
+    http-types mmorph mtl network-uri QuickCheck singleton-bool
+    sop-core string-conversions tagged text transformers vault
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    bytestring
-    hspec
-    http-media
-    mtl
-    QuickCheck
-    quickcheck-instances
-    string-conversions
-    text
-    transformers
+    aeson base base-compat bytestring hspec http-media mtl QuickCheck
+    quickcheck-instances string-conversions text transformers
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -92,4 +40,4 @@ mkDerivation {
   description = "A family of combinators for defining webservices APIs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/shake-bench.nix b/pkgs/shake-bench.nix
index bd016a4ed2ad337c6a70c7dbb80fa95f3f9d83c4..428f2d8e71f0ff9dd6148c4c2caf0751f7dc8c59 100644
--- a/pkgs/shake-bench.nix
+++ b/pkgs/shake-bench.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, Chart
-, Chart-diagrams
-, aeson
-, base
-, bytestring
-, diagrams-contrib
-, diagrams-core
-, diagrams-lib
-, diagrams-svg
-, directory
-, extra
-, filepath
-, lens
-, lens-aeson
-, lib
-, mtl
-, shake
+{ mkDerivation, Chart, Chart-diagrams, aeson, base, bytestring
+, diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg
+, directory, extra, filepath, lens, lens-aeson, lib, mtl, shake
 , text
 }:
 mkDerivation {
@@ -26,23 +11,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    Chart
-    Chart-diagrams
-    diagrams-contrib
-    diagrams-core
-    diagrams-lib
-    diagrams-svg
-    directory
-    extra
-    filepath
-    lens
-    lens-aeson
-    mtl
-    shake
-    text
+    aeson base bytestring Chart Chart-diagrams diagrams-contrib
+    diagrams-core diagrams-lib diagrams-svg directory extra filepath
+    lens lens-aeson mtl shake text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +25,4 @@ mkDerivation {
   description = "Build rules for historical benchmarking";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/shake.nix b/pkgs/shake.nix
index 048c73c22ee71b2e836bb41522b10ed91721306a..50bfb83bf1845191074f1f5005c6d69c2e390f0a 100644
--- a/pkgs/shake.nix
+++ b/pkgs/shake.nix
@@ -1,103 +1,31 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, deepseq
-, directory
-, extra
-, filepath
-, filepattern
-, hashable
-, heaps
-, js-dgtable
-, js-flot
-, js-jquery
-, lib
-, primitive
-, process
-, random
-, time
-, transformers
-, unix
-, unordered-containers
-, utf8-string
+{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq
+, directory, extra, filepath, filepattern, hashable, heaps
+, js-dgtable, js-flot, js-jquery, lib, primitive, process, random
+, time, transformers, unix, unordered-containers, utf8-string
 }:
 mkDerivation {
   pname = "shake";
-  version = "0.19.6";
-  sha256 = "7d9db837bfd67acaaabdb3cea29acc15559ede82dd9f75d438589268031cd542";
+  version = "0.19.7";
+  sha256 = "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1";
+  revision = "1";
+  editedCabalFile = "1hz57kw5pp5cpbicbi7x8sz8c6qy58dzyiljz9b9f2r1rr683d9w";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    directory
-    extra
-    filepath
-    filepattern
-    hashable
-    heaps
-    js-dgtable
-    js-flot
-    js-jquery
-    primitive
-    process
-    random
-    time
-    transformers
-    unix
-    unordered-containers
-    utf8-string
+    base binary bytestring deepseq directory extra filepath filepattern
+    hashable heaps js-dgtable js-flot js-jquery primitive process
+    random time transformers unix unordered-containers utf8-string
   ];
   executableHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    directory
-    extra
-    filepath
-    filepattern
-    hashable
-    heaps
-    js-dgtable
-    js-flot
-    js-jquery
-    primitive
-    process
-    random
-    time
-    transformers
-    unix
-    unordered-containers
-    utf8-string
+    base binary bytestring deepseq directory extra filepath filepattern
+    hashable heaps js-dgtable js-flot js-jquery primitive process
+    random time transformers unix unordered-containers utf8-string
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    directory
-    extra
-    filepath
-    filepattern
-    hashable
-    heaps
-    js-dgtable
-    js-flot
-    js-jquery
-    primitive
-    process
-    QuickCheck
-    random
-    time
-    transformers
-    unix
-    unordered-containers
+    base binary bytestring deepseq directory extra filepath filepattern
+    hashable heaps js-dgtable js-flot js-jquery primitive process
+    QuickCheck random time transformers unix unordered-containers
     utf8-string
   ];
   enableLibraryProfiling = true;
@@ -111,4 +39,4 @@ mkDerivation {
   description = "Build system library, like Make, but more accurate dependencies";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/shakespeare.nix b/pkgs/shakespeare.nix
index e5677a1d403091123d3768927bb5f8b248659fc7..d38490cde98afa66d44d74a7cda4480b08853a31 100644
--- a/pkgs/shakespeare.nix
+++ b/pkgs/shakespeare.nix
@@ -1,27 +1,8 @@
-{ mkDerivation
-, HUnit
-, aeson
-, base
-, blaze-html
-, blaze-markup
-, bytestring
-, containers
-, directory
-, exceptions
-, file-embed
-, ghc-prim
-, hspec
-, lib
-, parsec
-, process
-, scientific
-, template-haskell
-, text
-, th-lift
-, time
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, HUnit, aeson, base, blaze-html, blaze-markup
+, bytestring, containers, directory, exceptions, file-embed
+, ghc-prim, hspec, lib, parsec, process, scientific
+, template-haskell, text, th-lift, time, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "shakespeare";
@@ -31,45 +12,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    blaze-html
-    blaze-markup
-    bytestring
-    containers
-    directory
-    exceptions
-    file-embed
-    ghc-prim
-    parsec
-    process
-    scientific
-    template-haskell
-    text
-    th-lift
-    time
-    transformers
-    unordered-containers
-    vector
+    aeson base blaze-html blaze-markup bytestring containers directory
+    exceptions file-embed ghc-prim parsec process scientific
+    template-haskell text th-lift time transformers
+    unordered-containers vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    blaze-html
-    blaze-markup
-    bytestring
-    containers
-    directory
-    exceptions
-    ghc-prim
-    hspec
-    HUnit
-    parsec
-    process
-    template-haskell
-    text
-    time
-    transformers
+    aeson base blaze-html blaze-markup bytestring containers directory
+    exceptions ghc-prim hspec HUnit parsec process template-haskell
+    text time transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -82,4 +33,4 @@ mkDerivation {
   description = "A toolkit for making compile-time interpolated templates";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/shelly.nix b/pkgs/shelly.nix
index 15076baa5ea40945f7d559ad11950d24c093b991..e769716a3a6ab0e86453dbe0c59d3ee908cc9fa0 100644
--- a/pkgs/shelly.nix
+++ b/pkgs/shelly.nix
@@ -1,69 +1,23 @@
-{ mkDerivation
-, HUnit
-, async
-, base
-, bytestring
-, containers
-, directory
-, enclosed-exceptions
-, exceptions
-, filepath
-, hspec
-, hspec-contrib
-, lib
-, lifted-async
-, lifted-base
-, monad-control
-, mtl
-, process
-, text
-, time
-, transformers
-, transformers-base
-, unix-compat
+{ mkDerivation, HUnit, async, base, bytestring, containers
+, directory, enclosed-exceptions, exceptions, filepath, hspec
+, hspec-contrib, lib, lifted-async, lifted-base, monad-control, mtl
+, process, text, time, transformers, transformers-base, unix-compat
 }:
 mkDerivation {
   pname = "shelly";
-  version = "1.10.0";
-  sha256 = "c54000aff5ed59dc50f75754390c689aedb9792d3b327406caf146983380ff41";
-  revision = "1";
-  editedCabalFile = "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp";
+  version = "1.12.0";
+  sha256 = "2f6658d27ce0a7b7beebf939f3adc60dd9d963bf57d9e2f691194af17356bd9e";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    containers
-    directory
-    enclosed-exceptions
-    exceptions
-    filepath
-    lifted-async
-    lifted-base
-    monad-control
-    mtl
-    process
-    text
-    time
-    transformers
-    transformers-base
-    unix-compat
+    async base bytestring containers directory enclosed-exceptions
+    exceptions filepath lifted-async lifted-base monad-control mtl
+    process text time transformers transformers-base unix-compat
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    hspec
-    hspec-contrib
-    HUnit
-    lifted-async
-    mtl
-    text
-    transformers
-    unix-compat
+    base bytestring directory filepath hspec hspec-contrib HUnit
+    lifted-async mtl text transformers unix-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,8 +26,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/yesodweb/Shelly.hs";
+  homepage = "https://github.com/gregwebs/Shelly.hs";
   description = "shell-like (systems) programming in Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/shh.nix b/pkgs/shh.nix
index 84adf2b3cf3c1cdc4ca5f466fc1fbb3f8acee902..295b3737f8f855ac5c8786f7a6488f9ae77f9602 100644
--- a/pkgs/shh.nix
+++ b/pkgs/shh.nix
@@ -1,71 +1,27 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, doctest
-, filepath
-, lib
-, markdown-unlit
-, mtl
-, process
-, split
-, stringsearch
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, temporary
-, unix
+{ mkDerivation, Cabal, PyF, async, base, bytestring, cabal-doctest
+, containers, deepseq, directory, doctest, filepath, lib
+, markdown-unlit, mtl, process, split, stringsearch, tasty
+, tasty-hunit, tasty-quickcheck, template-haskell, temporary, unix
 , utf8-string
 }:
 mkDerivation {
   pname = "shh";
-  version = "0.7.2.0";
-  sha256 = "9e04100e43696cd6457c7d9e93eae313e5a9176c36b6108f7d70f3d6efdc9265";
-  revision = "1";
-  editedCabalFile = "054bjhpkni3nr6zsilj77gdgb2yw5s1gzm257zz4kigpjjjndr0a";
+  version = "0.7.2.1";
+  sha256 = "dbdaa98e8f5714e4d7bc6234d2e9371c3b613219febd529f323ccd560fc086dc";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
+  setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    process
-    split
-    stringsearch
-    template-haskell
-    unix
-    utf8-string
+    async base bytestring containers deepseq directory filepath mtl
+    process split stringsearch template-haskell unix utf8-string
   ];
   executableHaskellDepends = [
-    async
-    base
-    bytestring
-    deepseq
-    directory
-    temporary
-    unix
+    async base bytestring deepseq directory temporary unix
   ];
   testHaskellDepends = [
-    async
-    base
-    bytestring
-    directory
-    doctest
-    filepath
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    utf8-string
+    async base bytestring directory doctest filepath PyF tasty
+    tasty-hunit tasty-quickcheck utf8-string
   ];
   testToolDepends = [ markdown-unlit ];
   enableLibraryProfiling = true;
@@ -78,4 +34,4 @@ mkDerivation {
   description = "Simple shell scripting from Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/singletons-th.nix b/pkgs/singletons-th.nix
index c0f454938cf0d8c0d5dadd60ed3f81e6259ff154..54cac0d40d4a24e06c752875e8bf306000a0c04d 100644
--- a/pkgs/singletons-th.nix
+++ b/pkgs/singletons-th.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, ghc-boot-th
-, lib
-, mtl
-, singletons
-, syb
-, template-haskell
-, th-desugar
-, th-orphans
-, transformers
+{ mkDerivation, base, containers, ghc-boot-th, lib, mtl, singletons
+, syb, template-haskell, th-desugar, th-orphans, transformers
 }:
 mkDerivation {
   pname = "singletons-th";
@@ -19,16 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-boot-th
-    mtl
-    singletons
-    syb
-    template-haskell
-    th-desugar
-    th-orphans
-    transformers
+    base containers ghc-boot-th mtl singletons syb template-haskell
+    th-desugar th-orphans transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "A framework for generating singleton types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/skylighting-core.nix b/pkgs/skylighting-core.nix
index 8f9b4907795be90548b2de5d768afad11fe422ff..0d7f30be4c8320075004f7a5e0a0fd090d8b22ea 100644
--- a/pkgs/skylighting-core.nix
+++ b/pkgs/skylighting-core.nix
@@ -1,79 +1,28 @@
-{ mkDerivation
-, Diff
-, QuickCheck
-, aeson
-, attoparsec
-, base
-, base64-bytestring
-, binary
-, bytestring
-, case-insensitive
-, colour
-, containers
-, criterion
-, directory
-, filepath
-, lib
-, mtl
-, pretty-show
-, safe
-, tasty
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, text
-, transformers
-, utf8-string
-, xml-conduit
+{ mkDerivation, Diff, QuickCheck, aeson, attoparsec, base
+, base64-bytestring, binary, bytestring, case-insensitive, colour
+, containers, criterion, directory, filepath, lib, mtl, pretty-show
+, safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
+, transformers, utf8-string, xml-conduit
 }:
 mkDerivation {
   pname = "skylighting-core";
-  version = "0.13.1.1";
-  sha256 = "dab79d597f3fee1762a72bba69028c361cfbecaaa548155e0b99ab497d662933";
+  version = "0.13.2.1";
+  sha256 = "a480809ced173d6572b349a1874a16ff74b42501e4486e4180b41e27024f65c5";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base64-bytestring
-    binary
-    bytestring
-    case-insensitive
-    colour
-    containers
-    directory
-    filepath
-    mtl
-    safe
-    text
-    transformers
-    utf8-string
-    xml-conduit
+    aeson attoparsec base base64-bytestring binary bytestring
+    case-insensitive colour containers directory filepath mtl safe text
+    transformers utf8-string xml-conduit
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    Diff
-    directory
-    filepath
-    pretty-show
-    QuickCheck
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    text
+    aeson base bytestring containers Diff directory filepath
+    pretty-show QuickCheck tasty tasty-golden tasty-hunit
+    tasty-quickcheck text
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    criterion
-    filepath
-    text
+    base containers criterion filepath text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -86,4 +35,4 @@ mkDerivation {
   description = "syntax highlighting library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/skylighting-format-ansi.nix b/pkgs/skylighting-format-ansi.nix
index 3ebb2c78a9b1d4250fcc16b059a7ce4260f0e176..7f28874b3d6d431ee30997b7308214be606ce002 100644
--- a/pkgs/skylighting-format-ansi.nix
+++ b/pkgs/skylighting-format-ansi.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, binary
-, colour
-, containers
-, lib
-, skylighting-core
-, text
+{ mkDerivation, ansi-terminal, base, binary, colour, containers
+, lib, skylighting-core, text
 }:
 mkDerivation {
   pname = "skylighting-format-ansi";
@@ -16,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    binary
-    colour
-    containers
-    skylighting-core
-    text
+    ansi-terminal base binary colour containers skylighting-core text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "ANSI formatter for skylighting syntax highlighting library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/skylighting-format-blaze-html.nix b/pkgs/skylighting-format-blaze-html.nix
index 62528da3a9dfec8e077315953ee344d2cea49167..ff0489b3d4a41e9df3a9d142e9d317cad807d676 100644
--- a/pkgs/skylighting-format-blaze-html.nix
+++ b/pkgs/skylighting-format-blaze-html.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, blaze-html
-, containers
-, lib
-, skylighting-core
+{ mkDerivation, base, blaze-html, containers, lib, skylighting-core
 , text
 }:
 mkDerivation {
   pname = "skylighting-format-blaze-html";
-  version = "0.1";
-  sha256 = "eb989a6120798c9d8f1682d0a271e12cf096c3bbe24f605f74033375ac332969";
+  version = "0.1.1";
+  sha256 = "b1139b4df369de93d1ec6d8a2ed02bf11d559f9eaf71c31434fb5b19ba48ef13";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-html
-    containers
-    skylighting-core
-    text
+    base blaze-html containers skylighting-core text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "HTML formatter for skylighting syntax highlighting library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/skylighting-format-context.nix b/pkgs/skylighting-format-context.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c83245974ecb85f7fd9ad109588909a56a227a3d
--- /dev/null
+++ b/pkgs/skylighting-format-context.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, base, containers, lib, skylighting-core, text }:
+mkDerivation {
+  pname = "skylighting-format-context";
+  version = "0.1.0.2";
+  sha256 = "004213e13d89b692ea0912d7ffa6ee98c93146d1a7962a849ad7860697bc88bd";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base containers skylighting-core text ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/jgm/skylighting";
+  description = "ConTeXt formatter for skylighting syntax highlighting library";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/skylighting-format-latex.nix b/pkgs/skylighting-format-latex.nix
index 4208f6e216dcbf8a4b65d26e57e6b345de0d324e..749a55f3a62b30febf6138ef0dc692577e354092 100644
--- a/pkgs/skylighting-format-latex.nix
+++ b/pkgs/skylighting-format-latex.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "LaTeX formatter for skylighting syntax highlighting library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/skylighting.nix b/pkgs/skylighting.nix
index 0196d6327b88135f17dead8b459ce3fce0b9e909..04a0d35913af9c4ee3635ef159e6905a2b2f8042 100644
--- a/pkgs/skylighting.nix
+++ b/pkgs/skylighting.nix
@@ -1,41 +1,23 @@
-{ mkDerivation
-, base
-, binary
-, blaze-html
-, bytestring
-, containers
-, lib
-, pretty-show
-, skylighting-core
-, skylighting-format-ansi
-, skylighting-format-blaze-html
-, skylighting-format-latex
-, text
+{ mkDerivation, base, binary, blaze-html, bytestring, containers
+, lib, pretty-show, skylighting-core, skylighting-format-ansi
+, skylighting-format-blaze-html, skylighting-format-context
+, skylighting-format-latex, text
 }:
 mkDerivation {
   pname = "skylighting";
-  version = "0.13.1.1";
-  sha256 = "8bd0c8ec6572aed659718be82d9038f82a8a70de4f67ade5f3f1884f4e585c05";
+  version = "0.13.2.1";
+  sha256 = "f074b2d8a228dbadddc026939e1e76a3c06c1f650c41a154bee3dcb615430653";
   configureFlags = [ "-fexecutable" ];
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    containers
-    skylighting-core
-    skylighting-format-ansi
-    skylighting-format-blaze-html
+    base binary containers skylighting-core skylighting-format-ansi
+    skylighting-format-blaze-html skylighting-format-context
     skylighting-format-latex
   ];
   executableHaskellDepends = [
-    base
-    blaze-html
-    bytestring
-    containers
-    pretty-show
-    text
+    base blaze-html bytestring containers pretty-show text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +30,4 @@ mkDerivation {
   description = "syntax highlighting library";
   license = lib.licenses.gpl2Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/snap-core.nix b/pkgs/snap-core.nix
index 133f2599b9c19082bf57745cd505d97aa7f870d6..eb4dd14250ae2b2453f2b4d3f0138a1af5ae7160 100644
--- a/pkgs/snap-core.nix
+++ b/pkgs/snap-core.nix
@@ -1,113 +1,34 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, attoparsec
-, base
-, bytestring
-, bytestring-builder
-, case-insensitive
-, containers
-, deepseq
-, directory
-, filepath
-, hashable
-, io-streams
-, lib
-, lifted-base
-, monad-control
-, mtl
-, network
-, network-uri
-, old-locale
-, parallel
-, random
-, readable
-, regex-posix
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, time
-, transformers
-, transformers-base
-, unix-compat
-, unordered-containers
-, vector
-, zlib
+{ mkDerivation, HUnit, QuickCheck, attoparsec, base, bytestring
+, bytestring-builder, case-insensitive, containers, deepseq
+, directory, filepath, hashable, io-streams, lib, lifted-base
+, monad-control, mtl, network, network-uri, old-locale, parallel
+, random, readable, regex-posix, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text, time
+, transformers, transformers-base, unix-compat
+, unordered-containers, vector, zlib
 }:
 mkDerivation {
   pname = "snap-core";
-  version = "1.0.5.0";
-  sha256 = "642aedd244865560b5d656cd460e829a39d859ad031710b79bd112785e38c641";
-  revision = "3";
-  editedCabalFile = "02r6plphl4vqig3xap9amdib0qjd98nqpn5jhy6hsbiwh3p7cy9b";
+  version = "1.0.5.1";
+  sha256 = "a704c1a0e2c4ebfdcc8baf6feab09dd7715bdc9d750f7efb63d06e3965ec0502";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    bytestring-builder
-    case-insensitive
-    containers
-    directory
-    filepath
-    hashable
-    HUnit
-    io-streams
-    lifted-base
-    monad-control
-    mtl
-    network
-    network-uri
-    old-locale
-    random
-    readable
-    regex-posix
-    text
-    time
-    transformers
-    transformers-base
-    unix-compat
-    unordered-containers
-    vector
+    attoparsec base bytestring bytestring-builder case-insensitive
+    containers directory filepath hashable HUnit io-streams lifted-base
+    monad-control mtl network network-uri old-locale random readable
+    regex-posix text time transformers transformers-base unix-compat
+    unordered-containers vector
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    bytestring-builder
-    case-insensitive
-    containers
-    deepseq
-    directory
-    filepath
-    hashable
-    HUnit
-    io-streams
-    lifted-base
-    monad-control
-    mtl
-    network
-    network-uri
-    old-locale
-    parallel
-    QuickCheck
-    random
-    readable
-    regex-posix
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    time
-    transformers
-    transformers-base
-    unix-compat
-    unordered-containers
-    vector
-    zlib
+    attoparsec base bytestring bytestring-builder case-insensitive
+    containers deepseq directory filepath hashable HUnit io-streams
+    lifted-base monad-control mtl network network-uri old-locale
+    parallel QuickCheck random readable regex-posix test-framework
+    test-framework-hunit test-framework-quickcheck2 text time
+    transformers transformers-base unix-compat unordered-containers
+    vector zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -120,4 +41,4 @@ mkDerivation {
   description = "Snap: A Haskell Web Framework (core interfaces and types)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/snap-server.nix b/pkgs/snap-server.nix
index 5ae47cf452bc024c470ccb926a898f09b0927f85..7679165a7d29d8749a2fbf68334cf328da629d8e 100644
--- a/pkgs/snap-server.nix
+++ b/pkgs/snap-server.nix
@@ -1,132 +1,38 @@
-{ mkDerivation
-, HUnit
-, HsOpenSSL
-, QuickCheck
-, attoparsec
-, base
-, base16-bytestring
-, blaze-builder
-, bytestring
-, bytestring-builder
-, case-insensitive
-, clock
-, containers
-, criterion
-, deepseq
-, directory
-, filepath
-, http-common
-, http-streams
-, io-streams
-, io-streams-haproxy
-, lib
-, lifted-base
-, monad-control
-, mtl
-, network
-, old-locale
-, openssl-streams
-, parallel
-, random
-, snap-core
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, threads
-, time
-, transformers
-, unix
-, unix-compat
-, vector
+{ mkDerivation, HUnit, HsOpenSSL, QuickCheck, attoparsec, base
+, base16-bytestring, blaze-builder, bytestring, bytestring-builder
+, case-insensitive, clock, containers, criterion, deepseq
+, directory, filepath, http-common, http-streams, io-streams
+, io-streams-haproxy, lib, lifted-base, monad-control, mtl, network
+, old-locale, openssl-streams, parallel, random, snap-core
+, test-framework, test-framework-hunit, test-framework-quickcheck2
+, text, threads, time, transformers, unix, unix-compat, vector
 }:
 mkDerivation {
   pname = "snap-server";
-  version = "1.1.2.0";
-  sha256 = "92306f4148fd9eca06a608b9a8d46a95e928aee231ab320650f5d25854da9e70";
-  revision = "2";
-  editedCabalFile = "0dzsn3y7jnha1jbp0n5igjrg4cb8kggps798rlix60d66iy8r1l2";
+  version = "1.1.2.1";
+  sha256 = "a47457fd746db202711b6a6b34a8575daa291a01a99cd0900e639aadc06fca7e";
   configureFlags = [ "-fopenssl" ];
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-builder
-    bytestring
-    bytestring-builder
-    case-insensitive
-    clock
-    containers
-    filepath
-    HsOpenSSL
-    io-streams
-    io-streams-haproxy
-    lifted-base
-    mtl
-    network
-    old-locale
-    openssl-streams
-    snap-core
-    text
-    time
-    transformers
-    unix
-    unix-compat
-    vector
+    attoparsec base blaze-builder bytestring case-insensitive clock
+    containers filepath HsOpenSSL io-streams io-streams-haproxy
+    lifted-base mtl network old-locale openssl-streams snap-core text
+    time transformers unix unix-compat vector
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    base16-bytestring
-    blaze-builder
-    bytestring
-    bytestring-builder
-    case-insensitive
-    clock
-    containers
-    deepseq
-    directory
-    filepath
-    HsOpenSSL
-    http-common
-    http-streams
-    HUnit
-    io-streams
-    io-streams-haproxy
-    lifted-base
-    monad-control
-    mtl
-    network
-    old-locale
-    openssl-streams
-    parallel
-    QuickCheck
-    random
-    snap-core
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    threads
-    time
-    transformers
-    unix
-    unix-compat
-    vector
+    attoparsec base base16-bytestring blaze-builder bytestring
+    case-insensitive clock containers deepseq directory filepath
+    HsOpenSSL http-common http-streams HUnit io-streams
+    io-streams-haproxy lifted-base monad-control mtl network old-locale
+    openssl-streams parallel QuickCheck random snap-core test-framework
+    test-framework-hunit test-framework-quickcheck2 text threads time
+    transformers unix unix-compat vector
   ];
   benchmarkHaskellDepends = [
-    attoparsec
-    base
-    blaze-builder
-    bytestring
-    bytestring-builder
-    criterion
-    io-streams
-    io-streams-haproxy
-    snap-core
-    transformers
+    attoparsec base blaze-builder bytestring bytestring-builder
+    criterion io-streams io-streams-haproxy snap-core transformers
     vector
   ];
   enableLibraryProfiling = true;
@@ -140,4 +46,4 @@ mkDerivation {
   description = "A web server for the Snap Framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/some.nix b/pkgs/some.nix
index 130436c954e365cbe2471ce6e525b7291e726c99..84405e83ffb3d726bf072793bcad276cd3dd307d 100644
--- a/pkgs/some.nix
+++ b/pkgs/some.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, deepseq, lib }:
 mkDerivation {
   pname = "some";
-  version = "1.0.4";
-  sha256 = "446f9586d1cc9b7507f08ef7b178a7cff971bcf258d9658deacb7b65f18e3874";
-  revision = "1";
-  editedCabalFile = "0hwq21d0y2iwcrkdhqkq76fna90dsdzrkk6ryh9hbg71lf768ih9";
+  version = "1.0.5";
+  sha256 = "b0de79de39b5e02bbef673ed8af2a81cb9184a7fe5eb978e4bb0d906fddc915f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -21,4 +19,4 @@ mkDerivation {
   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 6c38c7435962b9f5159772f4b607085d59344a97..cca962e3334b76a4a3d83c21001651e33a87f069 100644
--- a/pkgs/sop-core.nix
+++ b/pkgs/sop-core.nix
@@ -1,10 +1,10 @@
 { mkDerivation, base, deepseq, lib }:
 mkDerivation {
   pname = "sop-core";
-  version = "0.5.0.1";
-  sha256 = "dac367f1608c9bd6c5dd1697e2a30e1b760617023b96e1df7d44c6c017999db0";
+  version = "0.5.0.2";
+  sha256 = "87bffd2254b98ded822d449fcd1c33dbd74d2ce96bf35e7a6714abc5a2297265";
   revision = "1";
-  editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd";
+  editedCabalFile = "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "True Sums of Products";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/souffle-haskell.nix b/pkgs/souffle-haskell.nix
index d68524e0d4c48c705f734352ccaed100c369a63e..e6c6ff7f3002f13f09a12cb76bb218d963ba0efa 100644
--- a/pkgs/souffle-haskell.nix
+++ b/pkgs/souffle-haskell.nix
@@ -1,59 +1,21 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, criterion
-, deepseq
-, directory
-, filepath
-, hedgehog
-, hspec
-, hspec-hedgehog
-, lib
-, mtl
-, process
-, profunctors
-, temporary
-, text
-, text-short
-, type-errors-pretty
-, vector
+{ mkDerivation, array, base, bytestring, criterion, deepseq
+, directory, filepath, hedgehog, hspec, hspec-hedgehog, lib, mtl
+, process, profunctors, temporary, text, text-short, vector
 }:
 mkDerivation {
   pname = "souffle-haskell";
-  version = "3.5.0";
-  sha256 = "79c9fc06da1265be3668e9ff1d23d9814d4d47a067cdb3c4f1949bea384ac3e8";
+  version = "3.5.1";
+  sha256 = "70b9b8fb6e58609675c5b29137557f1cbe599443dd0ab31ca33b1f66815ebc6f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    deepseq
-    directory
-    filepath
-    mtl
-    process
-    profunctors
-    temporary
-    text
-    text-short
-    type-errors-pretty
-    vector
+    array base bytestring deepseq directory filepath mtl process
+    profunctors temporary text text-short vector
   ];
   testHaskellDepends = [
-    array
-    base
-    directory
-    hedgehog
-    hspec
-    hspec-hedgehog
-    profunctors
-    temporary
-    text
-    text-short
-    vector
+    array base directory hedgehog hspec hspec-hedgehog profunctors
+    temporary text text-short vector
   ];
   benchmarkHaskellDepends = [ base criterion deepseq text vector ];
   enableLibraryProfiling = true;
@@ -67,4 +29,4 @@ mkDerivation {
   description = "Souffle Datalog bindings for Haskell";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/split.nix b/pkgs/split.nix
index a2f870ed7d27f779dc7470bc84fe7ec8c0ceaf91..a777926ca60ef0fe9c5e060889b603feea9d8e28 100644
--- a/pkgs/split.nix
+++ b/pkgs/split.nix
@@ -1,10 +1,8 @@
 { mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
   pname = "split";
-  version = "0.2.3.3";
-  sha256 = "1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413";
-  revision = "2";
-  editedCabalFile = "1c8bcssxq5rkxkixgms6w6x6lzf4n7cxk6cx6av1dp3lixdy9j34";
+  version = "0.2.3.5";
+  sha256 = "bf8aa8d610354a2b576946a6c838251ec5988c8374100638e6b2604513b93159";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +18,4 @@ mkDerivation {
   description = "Combinator library for splitting lists";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/statestack.nix b/pkgs/statestack.nix
index 7cdab9c798f30c6465e6f6556374679bd343842d..f3693bbd7b6f4ff11b4d8550b067022b6897e39e 100644
--- a/pkgs/statestack.nix
+++ b/pkgs/statestack.nix
@@ -1,10 +1,8 @@
 { mkDerivation, base, lib, mtl, transformers }:
 mkDerivation {
   pname = "statestack";
-  version = "0.3.1";
-  sha256 = "f9d2a2b7047a867c6eb3233db9528148fd773bdd0bdec29c13eb9f10dce71341";
-  revision = "1";
-  editedCabalFile = "1bvx9s7zssczqpwwgqw4cgmfdw1wjy0mwqlndjgnkjjn4nm31ml8";
+  version = "0.3.1.1";
+  sha256 = "cd55733032b34d671852c7b6d05c1645cea2f280ac35221d480cf721d5c7879c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +17,4 @@ mkDerivation {
   description = "Simple State-like monad transformer with saveable and restorable state";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix
index 8fab24a06e7e5f358f69ed8beb555216b10b8674..2d6d41715c1d203ce82a608a1bb7de4779ec89a2 100644
--- a/pkgs/statistics.nix
+++ b/pkgs/statistics.nix
@@ -1,70 +1,27 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, async
-, base
-, binary
-, data-default-class
-, deepseq
-, dense-linear-algebra
-, erf
-, ieee754
-, lib
-, math-functions
-, mwc-random
-, parallel
-, primitive
-, random
-, tasty
-, tasty-expected-failure
-, tasty-hunit
-, tasty-quickcheck
-, vector
-, vector-algorithms
-, vector-binary-instances
+{ mkDerivation, QuickCheck, aeson, async, base, binary
+, data-default-class, deepseq, dense-linear-algebra, erf, ieee754
+, lib, math-functions, mwc-random, parallel, primitive, random
+, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck
+, vector, vector-algorithms, vector-binary-instances
 , vector-th-unbox
 }:
 mkDerivation {
   pname = "statistics";
-  version = "0.16.1.0";
-  sha256 = "e8482a5c7605b60ea76288f36bd7feeadd145a0e48b1a6006e6ba9680b9e1900";
+  version = "0.16.1.2";
+  sha256 = "d867d909b277645ff8e787de24e5ac465a93779f1d97614cf858e1560407d997";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    binary
-    data-default-class
-    deepseq
-    dense-linear-algebra
-    math-functions
-    mwc-random
-    parallel
-    primitive
-    random
-    vector
-    vector-algorithms
-    vector-binary-instances
+    aeson async base binary data-default-class deepseq
+    dense-linear-algebra math-functions mwc-random parallel primitive
+    random vector vector-algorithms vector-binary-instances
     vector-th-unbox
   ];
   testHaskellDepends = [
-    aeson
-    base
-    binary
-    dense-linear-algebra
-    erf
-    ieee754
-    math-functions
-    primitive
-    QuickCheck
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    tasty-quickcheck
-    vector
-    vector-algorithms
+    aeson base binary dense-linear-algebra erf ieee754 math-functions
+    primitive QuickCheck tasty tasty-expected-failure tasty-hunit
+    tasty-quickcheck vector vector-algorithms
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -77,4 +34,4 @@ mkDerivation {
   description = "A library of statistical types, data, and functions";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/stm-chans.nix b/pkgs/stm-chans.nix
index b2656cd7e98be2be11fbc7c4ba285189a4cf2384..86018f741f37595c865bc13ca7264788acc7a5de 100644
--- a/pkgs/stm-chans.nix
+++ b/pkgs/stm-chans.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Additional types of channels for STM";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/stm-containers.nix b/pkgs/stm-containers.nix
index fe35bc597a235d218b1ab69b82bbd50b55dfc2ea..25cd789a6d38d2fc9260ccc87b4acff1bc3a346d 100644
--- a/pkgs/stm-containers.nix
+++ b/pkgs/stm-containers.nix
@@ -1,45 +1,20 @@
-{ mkDerivation
-, HTF
-, QuickCheck
-, base
-, deferred-folds
-, focus
-, foldl
-, free
-, hashable
-, lib
-, list-t
-, quickcheck-text
-, rerebase
-, stm-hamt
-, transformers
+{ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
+, lib, list-t, quickcheck-instances, rerebase, stm-hamt, tasty
+, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "stm-containers";
-  version = "1.2";
-  sha256 = "6c4d98b6a3182fa0dd99235cea1aa95a3c876f8be5cbb78f7700a17d64b7177a";
+  version = "1.2.0.2";
+  sha256 = "ad2df570b76e0e5b5d5df69080a53b5167832d624a6954acdca6a706f9813ea4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deferred-folds
-    focus
-    hashable
-    list-t
-    stm-hamt
-    transformers
+    base deferred-folds focus hashable list-t stm-hamt transformers
   ];
   testHaskellDepends = [
-    deferred-folds
-    focus
-    foldl
-    free
-    HTF
-    list-t
-    QuickCheck
-    quickcheck-text
-    rerebase
+    deferred-folds focus foldl free list-t quickcheck-instances
+    rerebase tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +27,4 @@ mkDerivation {
   description = "Containers for STM";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/stm-hamt.nix b/pkgs/stm-hamt.nix
index d03b67f646ccc40b3373ce0970bb2bb033fa7416..fa99207d46a5f494601b95beb60720ae1dd59aa2 100644
--- a/pkgs/stm-hamt.nix
+++ b/pkgs/stm-hamt.nix
@@ -1,61 +1,25 @@
-{ mkDerivation
-, QuickCheck
-, async
-, base
-, criterion
-, deferred-folds
-, focus
-, free
-, hashable
-, lib
-, list-t
-, mwc-random
-, mwc-random-monad
-, primitive
-, primitive-extras
-, quickcheck-instances
-, rebase
-, rerebase
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, transformers
+{ mkDerivation, QuickCheck, async, base, criterion, deferred-folds
+, focus, free, hashable, lib, list-t, mwc-random, mwc-random-monad
+, primitive, primitive-extras, quickcheck-instances, rebase
+, rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "stm-hamt";
-  version = "1.2.0.8";
-  sha256 = "6c74d4ba2292d0be95fa1599c40180953a24d9dbb5d12cc27cba475dde9676dc";
+  version = "1.2.0.9";
+  sha256 = "19a54e94b95c8cb63bbf03e09de9108bc1d2346783c60009838b5ca57f33a035";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deferred-folds
-    focus
-    hashable
-    list-t
-    primitive
-    primitive-extras
-    transformers
+    base deferred-folds focus hashable list-t primitive
+    primitive-extras transformers
   ];
   testHaskellDepends = [
-    deferred-folds
-    focus
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    deferred-folds focus QuickCheck quickcheck-instances rerebase tasty
+    tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    async
-    criterion
-    focus
-    free
-    list-t
-    mwc-random
-    mwc-random-monad
+    async criterion focus free list-t mwc-random mwc-random-monad
     rebase
   ];
   enableLibraryProfiling = true;
@@ -69,4 +33,4 @@ mkDerivation {
   description = "STM-specialised Hash Array Mapped Trie";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/storable-record.nix b/pkgs/storable-record.nix
index a339967ea6c5da14043abca11ff8fcd5ad3d74b0..0233703c5324a22afa631ddd74e56e47621f3bb6 100644
--- a/pkgs/storable-record.nix
+++ b/pkgs/storable-record.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, semigroups
-, transformers
+{ mkDerivation, QuickCheck, base, lib, semigroups, transformers
 , utility-ht
 }:
 mkDerivation {
   pname = "storable-record";
-  version = "0.0.6";
-  sha256 = "cd09cc2dda10c3addcb6a1f71f964fb33fd8ab4d2b4acd94cd08dfbc180b8cb4";
+  version = "0.0.7";
+  sha256 = "bec546c894d39182af50415743af226456a5f79da281d1a3c0b7db11362a2eb0";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    QuickCheck
-    semigroups
-    transformers
-    utility-ht
+    base QuickCheck semigroups transformers utility-ht
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   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
index 5ff68b1f0f57fff2c9b2090b1cbcd24a93cde30b..0770903e08594be85e2f0e373d143d0a1aad46c0 100644
--- a/pkgs/storable-tuple.nix
+++ b/pkgs/storable-tuple.nix
@@ -1,22 +1,15 @@
-{ mkDerivation
-, base
-, base-orphans
-, lib
-, storable-record
+{ mkDerivation, base, base-orphans, lib, storable-record
 , utility-ht
 }:
 mkDerivation {
   pname = "storable-tuple";
-  version = "0.0.3.3";
-  sha256 = "dcfac049527a45c386c80a7c40ec211455b83d74311af88fa686063b5f87df35";
+  version = "0.1";
+  sha256 = "034b4fa44239d60326af52fecde604ba65ef1f75cfd5cef1ded2079a3b86593c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    storable-record
-    utility-ht
+    base base-orphans storable-record utility-ht
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Storable instance for pairs and triples";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/streaming-commons.nix b/pkgs/streaming-commons.nix
index b7997328b264ec8f42892f8f7c72229c7f20112a..59ede015a24a823963115dce4dd7eb7c35eefc07 100644
--- a/pkgs/streaming-commons.nix
+++ b/pkgs/streaming-commons.nix
@@ -1,58 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, array
-, async
-, base
-, bytestring
-, deepseq
-, directory
-, gauge
-, hspec
-, lib
-, network
-, process
-, random
-, stm
-, text
-, transformers
-, unix
-, zlib
+{ 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.4";
-  sha256 = "56a1408cce710cddfb04d73757efba439c98fb8043515083a45136902214ccf2";
+  version = "0.2.2.5";
+  sha256 = "ca50819bdb2b248ced790e9faab07a3a5369ef702d9f9a932f26438bbeeca704";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    base
-    bytestring
-    directory
-    network
-    process
-    random
-    stm
-    text
-    transformers
-    unix
-    zlib
+    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
+    array async base bytestring deepseq hspec network QuickCheck text
+    unix zlib
   ];
+  testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +30,4 @@ mkDerivation {
   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/streamly-core.nix b/pkgs/streamly-core.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a9ce0b7a4180c714ff808586c97f0c5cd850f848
--- /dev/null
+++ b/pkgs/streamly-core.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, base, containers, directory, exceptions, filepath
+, fusion-plugin-types, ghc-prim, heaps, lib, monad-control
+, template-haskell, transformers
+}:
+mkDerivation {
+  pname = "streamly-core";
+  version = "0.1.0";
+  sha256 = "b4c52f3f192b4f259213231742df0ef12e7d504225afdfca7d1f48fec4734e2b";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    base containers directory exceptions filepath fusion-plugin-types
+    ghc-prim heaps monad-control template-haskell transformers
+  ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://streamly.composewell.com";
+  description = "Streaming, parsers, arrays and more";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/streamly.nix b/pkgs/streamly.nix
index 6bf5864f1c140ecc770f6172400340ce75f06b5f..c76536b3a4a10e8964663a7e8e1d0d63b4497755 100644
--- a/pkgs/streamly.nix
+++ b/pkgs/streamly.nix
@@ -1,50 +1,21 @@
-{ mkDerivation
-, atomic-primops
-, base
-, containers
-, deepseq
-, directory
-, exceptions
-, filepath
-, fusion-plugin-types
-, ghc-prim
-, heaps
-, lib
-, lockfree-queue
-, monad-control
-, mtl
-, network
-, primitive
-, transformers
-, transformers-base
-, unicode-data
+{ mkDerivation, atomic-primops, base, containers, deepseq
+, directory, exceptions, hashable, heaps, lib, lockfree-queue
+, monad-control, mtl, network, streamly-core, template-haskell
+, transformers, transformers-base, unicode-data
+, unordered-containers
 }:
 mkDerivation {
   pname = "streamly";
-  version = "0.8.3";
-  sha256 = "af8bc4fb86ba41f8970a9147e9ad290d17f44db123ea3db29bd04404fdcc5b76";
+  version = "0.9.0";
+  sha256 = "ec7735826f0a203ac1eaef4f4bd4c587b3868098af6e0dde65e02a910def92da";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    atomic-primops
-    base
-    containers
-    deepseq
-    directory
-    exceptions
-    filepath
-    fusion-plugin-types
-    ghc-prim
-    heaps
-    lockfree-queue
-    monad-control
-    mtl
-    network
-    primitive
-    transformers
-    transformers-base
-    unicode-data
+    atomic-primops base containers deepseq directory exceptions
+    hashable heaps lockfree-queue monad-control mtl network
+    streamly-core template-haskell transformers transformers-base
+    unicode-data unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,7 +25,7 @@ mkDerivation {
   doBenchmark = false;
   hyperlinkSource = false;
   homepage = "https://streamly.composewell.com";
-  description = "Dataflow programming and declarative concurrency";
+  description = "Streaming, dataflow programming and declarative concurrency";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/strict.nix b/pkgs/strict.nix
index b2d5a5e39476a9137ab1839c205ba7664ca86778..cbdbcef7f045b26654a254ee1637a36561e32110 100644
--- a/pkgs/strict.nix
+++ b/pkgs/strict.nix
@@ -1,40 +1,15 @@
-{ mkDerivation
-, assoc
-, base
-, binary
-, bytestring
-, deepseq
-, fetchgit
-, ghc-prim
-, hashable
-, lib
-, text
-, these
-, transformers
+{ mkDerivation, assoc, base, binary, bytestring, deepseq, ghc-prim
+, hashable, lib, text, these, transformers
 }:
 mkDerivation {
   pname = "strict";
   version = "0.5";
-  src = fetchgit {
-    url = "https://github.com/haskellari/strict";
-    sha256 = "0rh7jh54mz225dvmlwn8ynh5zrl94ssq44qp8096rsd6q5sbs5ib";
-    rev = "68876e95b4dbdca76bf4f5bd7164a35abf3bdcb7";
-    fetchSubmodules = true;
-  };
-  postUnpack = "sourceRoot+=/strict/; echo source root reset to $sourceRoot";
+  sha256 = "3f4f0995dec2d520d0e321542f71412dac023658fdab603db04364d75269a0fd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    assoc
-    base
-    binary
-    bytestring
-    deepseq
-    ghc-prim
-    hashable
-    text
-    these
+    assoc base binary bytestring deepseq ghc-prim hashable text these
     transformers
   ];
   enableLibraryProfiling = true;
@@ -48,4 +23,4 @@ mkDerivation {
   description = "Strict data types and String IO";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/swagger2.nix b/pkgs/swagger2.nix
index ec3d66bc0b6953f959996ce753639356ee58002c..7c611029118e37013091e5221566910632e0561d 100644
--- a/pkgs/swagger2.nix
+++ b/pkgs/swagger2.nix
@@ -1,97 +1,31 @@
-{ mkDerivation
-, Cabal
-, Glob
-, HUnit
-, QuickCheck
-, aeson
-, aeson-pretty
-, base
-, base-compat-batteries
-, bytestring
-, cabal-doctest
-, containers
-, cookie
-, doctest
-, generics-sop
-, hashable
-, hspec
-, hspec-discover
-, http-media
-, insert-ordered-containers
-, lens
-, lib
-, mtl
-, network
-, optics-core
-, optics-th
-, quickcheck-instances
-, scientific
-, template-haskell
-, text
-, time
-, transformers
-, unordered-containers
-, utf8-string
-, uuid-types
-, vector
+{ mkDerivation, Cabal, Glob, HUnit, QuickCheck, aeson, aeson-pretty
+, base, base-compat-batteries, bytestring, cabal-doctest
+, containers, cookie, doctest, generics-sop, hashable, hspec
+, hspec-discover, http-media, insert-ordered-containers, lens, lib
+, mtl, network, optics-core, optics-th, quickcheck-instances
+, scientific, template-haskell, text, time, transformers
+, unordered-containers, utf8-string, uuid-types, vector
 }:
 mkDerivation {
   pname = "swagger2";
-  version = "2.8.5";
-  sha256 = "660787d11c0aebd6668dcace2414d54e42fbb63dd703cd2491fb9bab4f31299b";
+  version = "2.8.6";
+  sha256 = "0481821f9145310e75a8171fbc59f825d14385c83c1f8cba3bf97762194a7fb3";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base-compat-batteries
-    bytestring
-    containers
-    cookie
-    generics-sop
-    hashable
-    http-media
-    insert-ordered-containers
-    lens
-    mtl
-    network
-    optics-core
-    optics-th
-    QuickCheck
-    scientific
-    template-haskell
-    text
-    time
-    transformers
-    unordered-containers
-    uuid-types
-    vector
+    aeson aeson-pretty base base-compat-batteries bytestring containers
+    cookie generics-sop hashable http-media insert-ordered-containers
+    lens mtl network optics-core optics-th QuickCheck scientific
+    template-haskell text time transformers unordered-containers
+    uuid-types vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat-batteries
-    bytestring
-    containers
-    doctest
-    Glob
-    hashable
-    hspec
-    HUnit
-    insert-ordered-containers
-    lens
-    mtl
-    QuickCheck
-    quickcheck-instances
-    template-haskell
-    text
-    time
-    unordered-containers
-    utf8-string
-    vector
+    aeson base base-compat-batteries bytestring containers doctest Glob
+    hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+    quickcheck-instances template-haskell text time
+    unordered-containers utf8-string vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -105,4 +39,4 @@ mkDerivation {
   description = "Swagger 2.0 data model";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/syb.nix b/pkgs/syb.nix
index 50ba06c48b50f3687bbef96c951679845573c9e8..3ed0f7a456c204d32dcf68c492bb62f81569c8a9 100644
--- a/pkgs/syb.nix
+++ b/pkgs/syb.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, containers, lib, mtl, tasty, tasty-hunit }:
 mkDerivation {
   pname = "syb";
-  version = "0.7.2.1";
-  sha256 = "1807c66f77e66786739387f0ae9f16d150d1cfa9d626afcb729f0e9b442a8d96";
+  version = "0.7.2.3";
+  sha256 = "d0b72daf16a947c4d9cb2d5774072f2153433224a04fd60fad60be9ffac8d91a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Scrap Your Boilerplate";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sydtest.nix b/pkgs/sydtest.nix
index f1389119abb40c8bcdfd39c89ed5785c40b7bcf3..4b9357ff59ee5b3eaac1838c69a27a9199886f2b 100644
--- a/pkgs/sydtest.nix
+++ b/pkgs/sydtest.nix
@@ -1,78 +1,26 @@
-{ mkDerivation
-, Diff
-, 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
-, split
-, stm
-, sydtest-discover
-, text
+{ 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.0";
-  sha256 = "856583d832d8b9e52a4d0ba6290b70e984ad1663cb300464961800ea8c2f4a57";
+  version = "0.13.0.1";
+  sha256 = "6361d2cf7fc678e27754727350d6de338eeb95442a02d4f81fed4527de5ba12a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    autodocodec
-    autodocodec-yaml
-    base
-    bytestring
-    containers
-    Diff
-    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
-    split
-    stm
-    text
+    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
+    base bytestring path path-io QuickCheck random safe-coloured-text
+    stm text vector
   ];
   testToolDepends = [ sydtest-discover ];
   enableLibraryProfiling = true;
@@ -86,4 +34,4 @@ mkDerivation {
   description = "A modern testing framework for Haskell with good defaults and advanced testing features";
   license = "unknown";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-bench.nix b/pkgs/tasty-bench.nix
index 333f24985d3456b9c5bea1f60384f5beef213b74..9b5b7ecb0042c1bef6ef4dc90968b4137ff35ddf 100644
--- a/pkgs/tasty-bench.nix
+++ b/pkgs/tasty-bench.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, base, containers, deepseq, lib, tasty }:
+{ mkDerivation, base, containers, deepseq, ghc-prim, lib, tasty }:
 mkDerivation {
   pname = "tasty-bench";
-  version = "0.3.2";
-  sha256 = "c83a3d3c37bb652274d062857616a9d1871031e624f5f7139e1cbbf1f47b2249";
+  version = "0.3.3";
+  sha256 = "757486ffcf9d4cd4afee4ff1b78e2174fda37cbda74aa887115e4d55d5531a8e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base containers deepseq tasty ];
+  libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ];
   benchmarkHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Featherlight benchmark framework";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-discover.nix b/pkgs/tasty-discover.nix
index f9b12a3bccc031baa32e18d0aea547ee7ae32818..1c65608d4790788dcbaecf409bfe2859001d7cd2 100644
--- a/pkgs/tasty-discover.nix
+++ b/pkgs/tasty-discover.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, Glob
-, base
-, bytestring
-, containers
-, directory
-, filepath
-, hedgehog
-, hspec
-, hspec-core
-, lib
-, tasty
-, tasty-golden
-, tasty-hedgehog
-, tasty-hspec
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, Glob, base, bytestring, containers, directory
+, filepath, hedgehog, hspec, hspec-core, lib, tasty, tasty-golden
+, tasty-hedgehog, tasty-hspec, tasty-hunit, tasty-quickcheck
 , tasty-smallcheck
 }:
 mkDerivation {
@@ -27,37 +13,15 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    directory
-    filepath
-    Glob
-    tasty
+    base containers directory filepath Glob tasty
   ];
   executableHaskellDepends = [
-    base
-    containers
-    directory
-    filepath
-    Glob
+    base containers directory filepath Glob
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    directory
-    filepath
-    Glob
-    hedgehog
-    hspec
-    hspec-core
-    tasty
-    tasty-golden
-    tasty-hedgehog
-    tasty-hspec
-    tasty-hunit
-    tasty-quickcheck
-    tasty-smallcheck
+    base bytestring containers directory filepath Glob hedgehog hspec
+    hspec-core tasty tasty-golden tasty-hedgehog tasty-hspec
+    tasty-hunit tasty-quickcheck tasty-smallcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -70,4 +34,4 @@ mkDerivation {
   description = "Test discovery for the tasty 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
index fd825a7a93b133dddc308a6aab78303d19b89b86..4fe37955ef01a5909c2a33bb8d744c483cd7d5ab 100644
--- a/pkgs/tasty-expected-failure.nix
+++ b/pkgs/tasty-expected-failure.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, hedgehog
-, lib
-, tagged
-, tasty
-, tasty-golden
-, tasty-hedgehog
-, tasty-hunit
-, unbounded-delays
+{ mkDerivation, base, hedgehog, lib, tagged, tasty, tasty-golden
+, tasty-hedgehog, tasty-hunit, unbounded-delays
 }:
 mkDerivation {
   pname = "tasty-expected-failure";
@@ -18,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base tagged tasty unbounded-delays ];
   testHaskellDepends = [
-    base
-    hedgehog
-    tasty
-    tasty-golden
-    tasty-hedgehog
-    tasty-hunit
+    base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   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
index 87f92465e4f6cdf1452e0d38638d1d9314dfa784..cd31975c5b4870a90dd0431e7b55a0038fdeb5fa 100644
--- a/pkgs/tasty-golden.nix
+++ b/pkgs/tasty-golden.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, lib
-, mtl
-, optparse-applicative
-, tagged
-, tasty
-, tasty-hunit
-, temporary
-, text
-, typed-process
+{ mkDerivation, async, base, bytestring, containers, deepseq
+, directory, filepath, lib, mtl, optparse-applicative, tagged
+, tasty, tasty-hunit, temporary, text, typed-process
 }:
 mkDerivation {
   pname = "tasty-golden";
@@ -24,29 +10,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    optparse-applicative
-    tagged
-    tasty
-    temporary
-    text
-    typed-process
+    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
+    base directory filepath tasty tasty-hunit temporary typed-process
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +27,4 @@ mkDerivation {
   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
index c22de81d8a934c996d176553c7c2b0e6078c1441..7908b4580e6797eb56fd9b229fab8f31e6358d2b 100644
--- a/pkgs/tasty-hedgehog.nix
+++ b/pkgs/tasty-hedgehog.nix
@@ -1,24 +1,16 @@
-{ mkDerivation
-, base
-, hedgehog
-, lib
-, tagged
-, tasty
+{ mkDerivation, base, hedgehog, lib, tagged, tasty
 , tasty-expected-failure
 }:
 mkDerivation {
   pname = "tasty-hedgehog";
-  version = "1.4.0.0";
-  sha256 = "93e4009389a7c14a37e9195ff8a96b739438543e2d408d089eebec6e715c9cbd";
+  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
+    base hedgehog tasty tasty-expected-failure
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Integration for tasty and hedgehog";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-hslua.nix b/pkgs/tasty-hslua.nix
index 8847c14876386f03bb22f7a73d66aed6d8211ae7..f7840ea669c9a49c6099ca4d5b2153312f95bfe5 100644
--- a/pkgs/tasty-hslua.nix
+++ b/pkgs/tasty-hslua.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, bytestring
-, hslua-core
-, lib
-, tasty
+{ mkDerivation, base, bytestring, hslua-core, lib, tasty
 , tasty-hunit
 }:
 mkDerivation {
   pname = "tasty-hslua";
-  version = "1.0.2";
-  sha256 = "28ddc669b81528b02a652452de3c0267916b5b58a4ffe43c7b0c3eca14ef6d45";
+  version = "1.1.0";
+  sha256 = "f53dd79c496effff3be54d5706ecdcf3117d04120795f9e54fc80f5ab0097211";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    hslua-core
-    tasty
-    tasty-hunit
+    base bytestring hslua-core tasty tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Tasty helpers to test HsLua";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-hspec.nix b/pkgs/tasty-hspec.nix
index f4ec366c2ae350f08cc57b7bebdc12b9c2abbb3a..a072bacc2f28d90ceb836bdd293bbaa98412ee5a 100644
--- a/pkgs/tasty-hspec.nix
+++ b/pkgs/tasty-hspec.nix
@@ -1,29 +1,17 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec
-, hspec-core
-, lib
-, tasty
-, tasty-quickcheck
-, tasty-smallcheck
+{ mkDerivation, QuickCheck, base, hspec, hspec-core, lib, tasty
+, tasty-quickcheck, tasty-smallcheck
 }:
 mkDerivation {
   pname = "tasty-hspec";
-  version = "1.2.0.1";
-  sha256 = "21813eff5187cd2489b855153466949b7379cfb2c7fc98ab680ad76a62177445";
+  version = "1.2.0.3";
+  sha256 = "9d5d6febcf5f723ecee79a088d13f8550297aead959ca6e52d5b03a598de0d94";
   revision = "1";
-  editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll";
+  editedCabalFile = "01sc5gmij3280b63jpjcz0a2lq045dj5ay46yq9i896cyka6gs6r";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hspec
-    hspec-core
-    QuickCheck
-    tasty
-    tasty-quickcheck
+    base hspec hspec-core QuickCheck tasty tasty-quickcheck
     tasty-smallcheck
   ];
   enableLibraryProfiling = true;
@@ -37,4 +25,4 @@ mkDerivation {
   description = "Hspec support for the Tasty test framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-hunit.nix b/pkgs/tasty-hunit.nix
index 4a1a1fc2e9987abc828bbb35863970512e0dc978..31f73555d6ae16a0fc8edce046589804518ff4d3 100644
--- a/pkgs/tasty-hunit.nix
+++ b/pkgs/tasty-hunit.nix
@@ -24,4 +24,4 @@ mkDerivation {
   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
index fd696a535465885e4c46e05826f1b369ddb4bc73..88e9ae48beda91fb7974c5085ad97314231388bf 100644
--- a/pkgs/tasty-inspection-testing.nix
+++ b/pkgs/tasty-inspection-testing.nix
@@ -1,24 +1,17 @@
-{ mkDerivation
-, base
-, ghc
-, inspection-testing
-, lib
-, tasty
+{ 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
+    base ghc inspection-testing tasty template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +24,4 @@ mkDerivation {
   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
index b27d4d9beb3c5cd1b5b4019e433f04ceac024aa2..53b4c5cb1bfce810095f937c9e23d704a36adfb9 100644
--- a/pkgs/tasty-kat.nix
+++ b/pkgs/tasty-kat.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, mtl
-, tasty
-, tasty-hunit
+{ mkDerivation, base, bytestring, lib, mtl, tasty, tasty-hunit
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring tasty ];
   testHaskellDepends = [
-    base
-    bytestring
-    mtl
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base bytestring mtl tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   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-lua.nix b/pkgs/tasty-lua.nix
index 70c40c4b160f47519789473fbc6a0b476d4e35c5..b36756b7f686382cdf19f82623cd297619791b6e 100644
--- a/pkgs/tasty-lua.nix
+++ b/pkgs/tasty-lua.nix
@@ -1,47 +1,21 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, directory
-, file-embed
-, filepath
-, hslua-core
-, hslua-marshalling
-, lib
-, lua-arbitrary
-, tasty
-, tasty-hunit
-, text
+{ mkDerivation, QuickCheck, base, bytestring, directory, file-embed
+, filepath, hslua-core, hslua-marshalling, lib, lua-arbitrary
+, tasty, tasty-hunit, text
 }:
 mkDerivation {
   pname = "tasty-lua";
-  version = "1.0.2";
-  sha256 = "9b37ed879487ea31dec48c5f1823e445de9bb29ef8ad893de7106f2dd9dbdeee";
+  version = "1.1.0";
+  sha256 = "33434b2a41080120886be023d43d1b52b18367fecc8693f4e5d06d28c855c7ae";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    file-embed
-    hslua-core
-    hslua-marshalling
-    lua-arbitrary
-    QuickCheck
-    tasty
-    text
+    base bytestring file-embed hslua-core hslua-marshalling
+    lua-arbitrary QuickCheck tasty text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    hslua-core
-    hslua-marshalling
-    lua-arbitrary
-    QuickCheck
-    tasty
-    tasty-hunit
+    base bytestring directory filepath hslua-core hslua-marshalling
+    lua-arbitrary QuickCheck tasty tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +28,4 @@ mkDerivation {
   description = "Write tests in Lua, integrate into 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
index ba1773d2ed208985e71199a4d2b9f17e51b80149..5c96b671de8e09cdceebdfc843b3850119e271bf 100644
--- a/pkgs/tasty-quickcheck.nix
+++ b/pkgs/tasty-quickcheck.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, optparse-applicative
-, pcre-light
-, random
-, tagged
-, tasty
-, tasty-hunit
+{ mkDerivation, QuickCheck, base, lib, optparse-applicative
+, pcre-light, random, tagged, tasty, tasty-hunit
 }:
 mkDerivation {
   pname = "tasty-quickcheck";
@@ -17,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    optparse-applicative
-    QuickCheck
-    random
-    tagged
-    tasty
+    base optparse-applicative QuickCheck random tagged tasty
   ];
   testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
   enableLibraryProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   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 fa6786e594af96a0bb32a5814c978d51528c21ff..d757d642453a4b09358bd3402729ef0d9f16faff 100644
--- a/pkgs/tasty-rerun.nix
+++ b/pkgs/tasty-rerun.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, mtl
-, optparse-applicative
-, split
-, stm
-, tagged
-, tasty
-, transformers
+{ mkDerivation, base, containers, lib, mtl, optparse-applicative
+, split, stm, tagged, tasty, transformers
 }:
 mkDerivation {
   pname = "tasty-rerun";
@@ -20,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    mtl
-    optparse-applicative
-    split
-    stm
-    tagged
-    tasty
+    base containers mtl optparse-applicative split stm tagged tasty
     transformers
   ];
   enableLibraryProfiling = true;
@@ -41,4 +25,4 @@ mkDerivation {
   description = "Rerun only tests which failed in a previous test run";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty-silver.nix b/pkgs/tasty-silver.nix
index f0de359923b0fee723f5c900fbcdf50be94a7ab8..cc3af97b4483d3c084002b56b4120a0bf2352fde 100644
--- a/pkgs/tasty-silver.nix
+++ b/pkgs/tasty-silver.nix
@@ -1,26 +1,7 @@
-{ 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, 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";
@@ -30,37 +11,13 @@ mkDerivation {
   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
+    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
+    base directory filepath process silently tasty tasty-hunit
+    temporary transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -73,4 +30,4 @@ mkDerivation {
   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
index 9e698bc9fdc64740dd40c3380bf30cf243810c8d..f553a009841cf15c32b08934308454efc77e941a 100644
--- a/pkgs/tasty-smallcheck.nix
+++ b/pkgs/tasty-smallcheck.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, optparse-applicative
-, smallcheck
-, tagged
+{ mkDerivation, base, lib, optparse-applicative, smallcheck, tagged
 , tasty
 }:
 mkDerivation {
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    optparse-applicative
-    smallcheck
-    tagged
-    tasty
+    base optparse-applicative smallcheck tagged tasty
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +24,4 @@ mkDerivation {
   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
index f3aba835a815e40c0fda5130846faffc5e742153..79efe551fe915590febdcdf67b9f0ad6e44919f9 100644
--- a/pkgs/tasty-th.nix
+++ b/pkgs/tasty-th.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, haskell-src-exts
-, lib
-, tasty
-, tasty-hunit
+{ mkDerivation, base, haskell-src-exts, lib, tasty, tasty-hunit
 , template-haskell
 }:
 mkDerivation {
@@ -14,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    haskell-src-exts
-    tasty
-    template-haskell
+    base haskell-src-exts tasty template-haskell
   ];
   testHaskellDepends = [ base tasty-hunit ];
   enableLibraryProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   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 c4ee0a393fb0e095b8135c2292ce271f1ec26910..74257de615cbaea6ce821013dc5674912582d9e1 100644
--- a/pkgs/tasty-wai.nix
+++ b/pkgs/tasty-wai.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, http-types
-, lib
-, tasty
-, wai
-, wai-extra
+{ mkDerivation, HUnit, base, bytestring, http-types, lib, tasty
+, wai, wai-extra
 }:
 mkDerivation {
   pname = "tasty-wai";
@@ -16,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    http-types
-    HUnit
-    tasty
-    wai
-    wai-extra
+    base bytestring http-types HUnit tasty wai wai-extra
   ];
   testHaskellDepends = [ base http-types tasty wai ];
   enableLibraryProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "Test 'wai' endpoints via Test.Tasty";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tasty.nix b/pkgs/tasty.nix
index 1d38a80a9c762b458c6d2257d928786dfe05e3a5..eb2ec45bbeb709a878247a37d3a6e2c784b33fb1 100644
--- a/pkgs/tasty.nix
+++ b/pkgs/tasty.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, containers
-, lib
-, optparse-applicative
-, stm
-, tagged
-, transformers
-, unix
+{ mkDerivation, ansi-terminal, base, containers, lib
+, optparse-applicative, stm, tagged, transformers, unix
 }:
 mkDerivation {
   pname = "tasty";
@@ -17,14 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    containers
-    optparse-applicative
-    stm
-    tagged
-    transformers
-    unix
+    ansi-terminal base containers optparse-applicative stm tagged
+    transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Modern and extensible testing framework";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/terminal-size.nix b/pkgs/terminal-size.nix
index a2ee4ab5db84c4df81fb2ddf17f0bb7de625fc68..26041874bcf650cb20905959789d85bd2fb961f3 100644
--- a/pkgs/terminal-size.nix
+++ b/pkgs/terminal-size.nix
@@ -1,8 +1,8 @@
 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "terminal-size";
-  version = "0.3.3";
-  sha256 = "8c174c8fa7200be2caffd6d25f789fd3c73f4b7b02989f332a42d7901fca60c3";
+  version = "0.3.4";
+  sha256 = "b0f070d6926cdaacf3a412c5518e5c23afca1e0ed00808a5328c96e468b67f49";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Get terminal window height and width";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/texmath.nix b/pkgs/texmath.nix
index 27b54bd9b2134e4ffc834bd380224b7c2202b434..1133fe70979598969a79c5d40b09d6c5c57f3331 100644
--- a/pkgs/texmath.nix
+++ b/pkgs/texmath.nix
@@ -1,51 +1,20 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, directory
-, filepath
-, lib
-, mtl
-, pandoc-types
-, parsec
-, pretty-show
-, split
-, syb
-, tagged
-, tasty
-, tasty-golden
-, text
-, xml
+{ mkDerivation, base, bytestring, containers, directory, filepath
+, lib, mtl, pandoc-types, parsec, pretty-show, split, syb, tagged
+, tasty, tasty-golden, text, xml
 }:
 mkDerivation {
   pname = "texmath";
-  version = "0.12.5.4";
-  sha256 = "98423b2e07d90d3f50afa7cd4755c8e65bc8712db248ba030bc478518646c8b6";
+  version = "0.12.6";
+  sha256 = "6fc38a9e876650e3466e4167f7aa5242fbbe5a5f636528af1d6e607da913fe98";
   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 xml
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    pretty-show
-    tagged
-    tasty
-    tasty-golden
-    text
-    xml
+    base bytestring directory filepath pretty-show tagged tasty
+    tasty-golden text xml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +27,4 @@ mkDerivation {
   description = "Conversion between math formats";
   license = lib.licenses.gpl2Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-ansi.nix b/pkgs/text-ansi.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cf16695e2489bb0e285441b455a7dbdcc15fb3ce
--- /dev/null
+++ b/pkgs/text-ansi.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, base, lib, text, text-builder }:
+mkDerivation {
+  pname = "text-ansi";
+  version = "0.2.1";
+  sha256 = "17248ef4da66e18580e7cf2e20c2c688843fe9dba2da41f9bfe0a7ab2c680ae8";
+  revision = "1";
+  editedCabalFile = "0yvl94zb6s6v3sla42qy44fnqs5p60in0ljyjwylyjkaiv63m70x";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base text text-builder ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/mitchellwrosen/text-ansi";
+  description = "Text styling for ANSI terminals";
+  license = lib.licenses.bsd3;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/text-builder-dev.nix b/pkgs/text-builder-dev.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f4eb68cba6581da176a83f5e7b15a58dd419eb8a
--- /dev/null
+++ b/pkgs/text-builder-dev.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, QuickCheck, base, bytestring, criterion
+, deferred-folds, isomorphism-class, lib, quickcheck-instances
+, rerebase, split, tasty, tasty-hunit, tasty-quickcheck, text
+, transformers
+}:
+mkDerivation {
+  pname = "text-builder-dev";
+  version = "0.3.3.2";
+  sha256 = "f574e2219a44ba4c14ee9d373f59bee3ed9a3863082468d97bff5621a82755af";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [
+    base bytestring deferred-folds isomorphism-class split text
+    transformers
+  ];
+  testHaskellDepends = [
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+    tasty-quickcheck
+  ];
+  benchmarkHaskellDepends = [ criterion rerebase ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/nikita-volkov/text-builder-dev";
+  description = "Edge of developments for \"text-builder\"";
+  license = lib.licenses.mit;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/text-builder.nix b/pkgs/text-builder.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f8642723724a23e17eaec4ef078e953482efa5f7
--- /dev/null
+++ b/pkgs/text-builder.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, QuickCheck, base, bytestring, criterion, lib
+, quickcheck-instances, rerebase, tasty, tasty-hunit
+, tasty-quickcheck, text, text-builder-dev
+}:
+mkDerivation {
+  pname = "text-builder";
+  version = "0.6.7";
+  sha256 = "90704ab83910db16d43aeb45e1bab1409f995e38c8c15101602eb38b9724f402";
+  isLibrary = true;
+  isExecutable = false;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base bytestring text text-builder-dev ];
+  testHaskellDepends = [
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+    tasty-quickcheck
+  ];
+  benchmarkHaskellDepends = [ criterion rerebase ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "https://github.com/nikita-volkov/text-builder";
+  description = "An efficient strict text builder";
+  license = lib.licenses.mit;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/text-zipper.nix b/pkgs/text-zipper.nix
index 86191581d2745e140a5adf8ad791ce4da3d7ff1e..18f49d821f1ff252768501efc5d2324ea7d506d6 100644
--- a/pkgs/text-zipper.nix
+++ b/pkgs/text-zipper.nix
@@ -1,16 +1,9 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, hspec
-, lib
-, text
-, vector
+{ mkDerivation, QuickCheck, base, deepseq, hspec, lib, text, vector
 }:
 mkDerivation {
   pname = "text-zipper";
-  version = "0.12";
-  sha256 = "86aba7244c9ed0d8e24e9d1fa64ee317a062e7bd777018053517daefb0696702";
+  version = "0.13";
+  sha256 = "06521cc7c435f8e85aeb3ed3f2b872000c52087d73518de31e65bdca072a98a9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
@@ -27,4 +20,4 @@ mkDerivation {
   description = "A text editor zipper library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/th-abstraction.nix b/pkgs/th-abstraction.nix
index f1b4d4ece842aa73bb6db3b5fb83101c9828104f..294eb63e6894c2b95bd909ff067ce023622e1347 100644
--- a/pkgs/th-abstraction.nix
+++ b/pkgs/th-abstraction.nix
@@ -1,22 +1,14 @@
-{ mkDerivation
-, base
-, containers
-, ghc-prim
-, lib
-, template-haskell
+{ mkDerivation, base, containers, ghc-prim, lib, template-haskell
 }:
 mkDerivation {
   pname = "th-abstraction";
-  version = "0.4.5.0";
-  sha256 = "00d5e24f247e328bd9898d5af5915c1e86b134b4d40baa680258635f95031526";
+  version = "0.5.0.0";
+  sha256 = "8258dc3ab7188af5826e2467032b52a931a3af4d8a93d4a094210e240a8a9964";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    template-haskell
+    base containers ghc-prim template-haskell
   ];
   testHaskellDepends = [ base containers template-haskell ];
   enableLibraryProfiling = true;
@@ -30,4 +22,4 @@ mkDerivation {
   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
index 1663c9f133def7b9abb0f16f089e79218f2225b2..60ea3ed69d04f50330fd2027e6741f44d19912b4 100644
--- a/pkgs/th-compat.nix
+++ b/pkgs/th-compat.nix
@@ -1,26 +1,18 @@
-{ mkDerivation
-, base
-, base-compat
-, hspec
-, hspec-discover
-, lib
-, mtl
+{ 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
+    base base-compat hspec mtl template-haskell
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -34,4 +26,4 @@ mkDerivation {
   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 64da73206d529e433823798e29479451b16d9ac1..278b132d33b4d131c24f7a3b7e825734cc116af3 100644
--- a/pkgs/th-desugar.nix
+++ b/pkgs/th-desugar.nix
@@ -1,49 +1,20 @@
-{ mkDerivation
-, HUnit
-, base
-, containers
-, ghc-prim
-, hspec
-, lib
-, mtl
-, ordered-containers
-, syb
-, template-haskell
-, th-abstraction
-, th-lift
-, th-orphans
-, transformers-compat
+{ mkDerivation, HUnit, base, containers, ghc-prim, hspec, lib, mtl
+, ordered-containers, syb, template-haskell, th-abstraction
+, th-orphans, transformers-compat
 }:
 mkDerivation {
   pname = "th-desugar";
-  version = "1.14";
-  sha256 = "dfb2d3c5f3ffec189452b1db7edb743b9b7b006cc16c19a9ece083de4bd8a7ac";
+  version = "1.15";
+  sha256 = "179e2cddabb1af642d08e304fa24f4910ad42aae10095961a47d0c916e5ffe98";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    mtl
-    ordered-containers
-    syb
-    template-haskell
-    th-abstraction
-    th-lift
-    th-orphans
-    transformers-compat
+    base containers ghc-prim mtl ordered-containers syb
+    template-haskell th-abstraction th-orphans transformers-compat
   ];
   testHaskellDepends = [
-    base
-    containers
-    hspec
-    HUnit
-    mtl
-    syb
-    template-haskell
-    th-abstraction
-    th-lift
+    base containers hspec HUnit mtl syb template-haskell th-abstraction
     th-orphans
   ];
   enableLibraryProfiling = true;
@@ -57,4 +28,4 @@ mkDerivation {
   description = "Functions to desugar Template Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/th-env.nix b/pkgs/th-env.nix
index 096bd6c655819a2d354e559195d724c36ce23325..fae0a6faf5a6dc2f94a5931c551e11fde74e589d 100644
--- a/pkgs/th-env.nix
+++ b/pkgs/th-env.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, markdown-unlit
-, template-haskell
+{ mkDerivation, base, lib, markdown-unlit, template-haskell
 , th-compat
 }:
 mkDerivation {
@@ -26,4 +22,4 @@ mkDerivation {
   description = "Template Haskell splices that expand to an environment variable";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/th-expand-syns.nix b/pkgs/th-expand-syns.nix
index aed5d3f76e1a835029e25a11a132b247a17d3222..3ea3b732085567e5f6f019b9d7a34c991b7895e2 100644
--- a/pkgs/th-expand-syns.nix
+++ b/pkgs/th-expand-syns.nix
@@ -1,24 +1,17 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, syb
-, template-haskell
+{ mkDerivation, base, containers, lib, syb, template-haskell
 , th-abstraction
 }:
 mkDerivation {
   pname = "th-expand-syns";
-  version = "0.4.10.0";
-  sha256 = "f5455844e27578cf937c2eb670f15f6c10a45c29b2599e32bf308245360c9010";
+  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
+    base containers syb template-haskell th-abstraction
   ];
   testHaskellDepends = [ base template-haskell th-abstraction ];
   enableLibraryProfiling = true;
@@ -32,4 +25,4 @@ mkDerivation {
   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 0ec3dd59fa026bcc23227e042adad98215bbbe6a..48a38f47fee4dc0cb781b1e9bf767d8212e9849c 100644
--- a/pkgs/th-extras.nix
+++ b/pkgs/th-extras.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, syb
-, template-haskell
+{ mkDerivation, base, containers, lib, syb, template-haskell
 , th-abstraction
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    syb
-    template-haskell
-    th-abstraction
+    base containers syb template-haskell th-abstraction
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "A grab bag of functions for use with Template Haskell";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/th-lift-instances.nix b/pkgs/th-lift-instances.nix
index d746f03f575e8d800d72c036914a1b4fbaf48dc8..60eb1d2231a917134edf7d889b438daca3830e00 100644
--- a/pkgs/th-lift-instances.nix
+++ b/pkgs/th-lift-instances.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, lib
-, template-haskell
-, text
-, th-lift
-, transformers
-, vector
+{ mkDerivation, QuickCheck, base, bytestring, containers, lib
+, template-haskell, text, th-lift, transformers, vector
 }:
 mkDerivation {
   pname = "th-lift-instances";
@@ -18,23 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    template-haskell
-    text
-    th-lift
-    transformers
-    vector
+    base bytestring containers template-haskell text th-lift
+    transformers vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    QuickCheck
-    template-haskell
-    text
-    vector
+    base bytestring containers QuickCheck template-haskell text vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   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
index 4c5336632f1f3932310914637dbeeb8d960e585b..275bbc4158e0cadba745f5b33176ffb50a57cd94 100644
--- a/pkgs/th-lift.nix
+++ b/pkgs/th-lift.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, ghc-prim
-, lib
-, template-haskell
+{ mkDerivation, base, ghc-prim, lib, template-haskell
 , th-abstraction
 }:
 mkDerivation {
   pname = "th-lift";
-  version = "0.8.2";
-  sha256 = "3a5927037a10ae63e605c02228c4027c32b7bab1985ae7b5379e6363b3cd5ce4";
-  revision = "2";
-  editedCabalFile = "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi";
+  version = "0.8.3";
+  sha256 = "25d57bf5f8e7deefeb4ace0539805ae1e90b1ba5a034ebcc36141846408c6b75";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    ghc-prim
-    template-haskell
-    th-abstraction
+    base ghc-prim template-haskell th-abstraction
   ];
   testHaskellDepends = [ base ghc-prim template-haskell ];
   enableLibraryProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   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
index 6fcac1ec6b6335d494ca6214c87a8e855ee62a5f..ee4d28cd2247c95407db3e9850e79c6c51f929fc 100644
--- a/pkgs/th-orphans.nix
+++ b/pkgs/th-orphans.nix
@@ -1,38 +1,20 @@
-{ mkDerivation
-, base
-, bytestring
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, mtl
-, template-haskell
-, th-compat
-, th-lift
-, th-reify-many
+{ 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
+    base mtl template-haskell th-compat th-lift th-reify-many
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    ghc-prim
-    hspec
-    template-haskell
-    th-lift
+    base bytestring ghc-prim hspec template-haskell th-lift
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   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
index bdba1f29bb5e916c47afdbcc35cfcbfe7d1f5b6f..cd7e7f1414aaa38eb22e071d6f0b4b9ec9cb9cc6 100644
--- a/pkgs/th-reify-many.nix
+++ b/pkgs/th-reify-many.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, mtl
-, safe
-, template-haskell
+{ mkDerivation, base, containers, lib, mtl, safe, template-haskell
 , th-expand-syns
 }:
 mkDerivation {
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    mtl
-    safe
-    template-haskell
-    th-expand-syns
+    base containers mtl safe template-haskell th-expand-syns
   ];
   testHaskellDepends = [ base template-haskell ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   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
index ac1e951996eb58f546aceeb5193ab08d60bb1cb7..47ba29b4d59d3b41d6ec9dab700e227ca902b66c 100644
--- a/pkgs/th-utilities.nix
+++ b/pkgs/th-utilities.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, directory
-, filepath
-, hspec
-, lib
-, primitive
-, syb
-, template-haskell
-, text
-, th-abstraction
-, th-orphans
-, vector
+{ mkDerivation, base, bytestring, containers, directory, filepath
+, hspec, lib, primitive, syb, template-haskell, text
+, th-abstraction, th-orphans, vector
 }:
 mkDerivation {
   pname = "th-utilities";
@@ -22,32 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    directory
-    filepath
-    primitive
-    syb
-    template-haskell
-    text
-    th-abstraction
-    th-orphans
+    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
+    base bytestring containers directory filepath hspec primitive syb
+    template-haskell text th-abstraction th-orphans vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +28,4 @@ mkDerivation {
   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/tidal-link.nix b/pkgs/tidal-link.nix
new file mode 100644
index 0000000000000000000000000000000000000000..796faca3a47aba2b6a5260ef2597e6590205a00f
--- /dev/null
+++ b/pkgs/tidal-link.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, base, lib, system-cxx-std-lib }:
+mkDerivation {
+  pname = "tidal-link";
+  version = "1.0.1";
+  sha256 = "612d2670302d401250fab9b5be96ba4416905bfa841ce11857b267d2ff387d68";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = false;
+  libraryHaskellDepends = [ base system-cxx-std-lib ];
+  executableHaskellDepends = [ base ];
+  enableLibraryProfiling = true;
+  enableExecutableProfiling = true;
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  doBenchmark = false;
+  hyperlinkSource = false;
+  homepage = "http://tidalcycles.org/";
+  description = "Ableton Link integration for Tidal";
+  license = lib.licenses.gpl3Only;
+  broken = false;
+}
\ No newline at end of file
diff --git a/pkgs/tidal.nix b/pkgs/tidal.nix
index 72ac571df8f44403aa72e4bebece132df9b0093a..d04c6e98fd355a00e83464a7a4964ae1448e0bf8 100644
--- a/pkgs/tidal.nix
+++ b/pkgs/tidal.nix
@@ -1,59 +1,21 @@
-{ mkDerivation
-, base
-, bifunctors
-, bytestring
-, clock
-, colour
-, containers
-, criterion
-, deepseq
-, exceptions
-, hosc
-, lib
-, microspec
-, mtl
-, network
-, parsec
-, primitive
-, random
-, text
-, transformers
-, weigh
+{ mkDerivation, base, bytestring, clock, colour, containers
+, criterion, deepseq, exceptions, hosc, lib, microspec, mtl
+, network, parsec, primitive, random, text, tidal-link
+, transformers, weigh
 }:
 mkDerivation {
   pname = "tidal";
-  version = "1.8.1";
-  sha256 = "093611c3d977bc5972a4446573de5358e80ef015185ed84ad27af82415040000";
-  revision = "1";
-  editedCabalFile = "0mnxl1ynxf2cgqlrbkshw8qngiw7b6lf0lsjkd6hjhkh2xbxgxzx";
+  version = "1.9.4";
+  sha256 = "61dbc51935327c79d2714ab334a7abb1e81c1b3a0363d8de0018618a6901d788";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    bifunctors
-    bytestring
-    clock
-    colour
-    containers
-    deepseq
-    exceptions
-    hosc
-    mtl
-    network
-    parsec
-    primitive
-    random
-    text
-    transformers
+    base bytestring clock colour containers deepseq exceptions hosc mtl
+    network parsec primitive random text tidal-link transformers
   ];
   testHaskellDepends = [
-    base
-    containers
-    deepseq
-    hosc
-    microspec
-    parsec
+    base containers deepseq hosc microspec parsec
   ];
   benchmarkHaskellDepends = [ base criterion weigh ];
   enableLibraryProfiling = true;
@@ -67,4 +29,4 @@ mkDerivation {
   description = "Pattern language for improvised music";
   license = lib.licenses.gpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/transformers-except.nix b/pkgs/transformers-except.nix
index 7528a39b5be4cd6a8ee75f1e20c5cbd130c4fb27..2ce848f65aea1a76644d084caf20cd63b331c1ea 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.2";
-  sha256 = "9925f82037b9aa9d382e98cff91a6ca12009093b7aaa1f583c91429b6ebcfd03";
+  version = "0.1.3";
+  sha256 = "484babf024bd82e87cc8305bd38ae04d40a7c24fa81c487cc603c3c9fd230c0d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "An Except monad transformer with";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tree-diff.nix b/pkgs/tree-diff.nix
index 553a17fb44548523d4cb3b1011a9e2d3ce4da563..1c3be17ec32787cb63932093b73d8ad2d456c839 100644
--- a/pkgs/tree-diff.nix
+++ b/pkgs/tree-diff.nix
@@ -1,36 +1,9 @@
-{ 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, 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";
@@ -40,45 +13,14 @@ mkDerivation {
   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
+    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
+    ansi-terminal ansi-wl-pprint base base-compat parsec primitive
+    QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta
   ];
   benchmarkHaskellDepends = [ base criterion deepseq Diff ];
   enableLibraryProfiling = true;
@@ -92,4 +34,4 @@ mkDerivation {
   description = "Diffing of (expression) trees";
   license = lib.licenses.gpl2Plus;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/type-errors.nix b/pkgs/type-errors.nix
index 5af76f606b6ec2866b985c7bbe76980919d0f760..3f126087bb9a32c6827d77e1d20c49cb99b27fcd 100644
--- a/pkgs/type-errors.nix
+++ b/pkgs/type-errors.nix
@@ -1,34 +1,18 @@
-{ mkDerivation
-, base
-, doctest
-, first-class-families
-, lib
-, syb
-, template-haskell
-, th-abstraction
+{ mkDerivation, base, doctest, first-class-families, lib, syb
+, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "type-errors";
-  version = "0.2.0.0";
-  sha256 = "174d509c30ec806117a244add923fee578ba5f3505b0156f4e03a32023892eb4";
-  revision = "3";
-  editedCabalFile = "0ig8qd2g8rd5n78039xhbq7n8r514f8kvbh0mgajav2a5lp549s1";
+  version = "0.2.0.1";
+  sha256 = "d537369e6bef4d7656d5de45e5ebb6687fe3e3666e21abdb78a23d295ff14137";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    first-class-families
-    syb
-    template-haskell
-    th-abstraction
+    base first-class-families syb template-haskell th-abstraction
   ];
   testHaskellDepends = [
-    base
-    doctest
-    first-class-families
-    syb
-    template-haskell
+    base doctest first-class-families syb template-haskell
     th-abstraction
   ];
   enableLibraryProfiling = true;
@@ -42,4 +26,4 @@ mkDerivation {
   description = "Tools for writing better type errors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/typed-process.nix b/pkgs/typed-process.nix
index 39d446e40c48aacd377d5e36d005090f34b1bd2a..7102232a380dec7914b9f7f1e2afe1c1f4702b25 100644
--- a/pkgs/typed-process.nix
+++ b/pkgs/typed-process.nix
@@ -1,43 +1,19 @@
-{ mkDerivation
-, async
-, base
-, base64-bytestring
-, bytestring
-, hspec
-, lib
-, process
-, stm
-, temporary
-, transformers
-, unliftio-core
+{ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+, lib, process, stm, temporary, transformers, unliftio-core
 }:
 mkDerivation {
   pname = "typed-process";
-  version = "0.2.10.1";
-  sha256 = "e436875ccd6664d4111e601c8e2ec6ba9473979eac49b23a1bdb88f80e95099e";
+  version = "0.2.11.0";
+  sha256 = "948c59540675d85f35c99e285cdb8686713ec1689f530d5d21813239ea91f625";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    process
-    stm
-    transformers
-    unliftio-core
+    async base bytestring process stm transformers unliftio-core
   ];
   testHaskellDepends = [
-    async
-    base
-    base64-bytestring
-    bytestring
-    hspec
-    process
-    stm
-    temporary
-    transformers
-    unliftio-core
+    async base base64-bytestring bytestring hspec process stm temporary
+    transformers unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -50,4 +26,4 @@ mkDerivation {
   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/unicode-collation.nix b/pkgs/unicode-collation.nix
index 2efa67695e79a7ec212822d2abd5d48e1ecd93ef..880ce063e3e5d48fc1ca2e77458526d7ae3ad179 100644
--- a/pkgs/unicode-collation.nix
+++ b/pkgs/unicode-collation.nix
@@ -1,55 +1,25 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, containers
-, lib
-, parsec
-, quickcheck-instances
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
-, text-icu
-, th-lift-instances
-, unicode-transforms
+{ mkDerivation, QuickCheck, base, binary, bytestring, containers
+, lib, parsec, quickcheck-instances, tasty, tasty-bench
+, tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu
+, th-lift-instances, unicode-transforms
 }:
 mkDerivation {
   pname = "unicode-collation";
-  version = "0.1.3.2";
-  sha256 = "ec54952221a8bb79d5dbd9abd4501ffcce4be07fbe500928394c108ea010cb66";
+  version = "0.1.3.4";
+  sha256 = "b08dbe9bb269d6eda2639cdfc63caee136794f46c16a1ad51b5305dd2ea6d429";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    containers
-    parsec
-    template-haskell
-    text
+    base binary bytestring containers parsec template-haskell text
     th-lift-instances
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring tasty tasty-hunit tasty-quickcheck text
     unicode-transforms
   ];
   benchmarkHaskellDepends = [
-    base
-    QuickCheck
-    quickcheck-instances
-    tasty-bench
-    text
-    text-icu
+    base QuickCheck quickcheck-instances tasty-bench text text-icu
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -62,4 +32,4 @@ mkDerivation {
   description = "Haskell implementation of the Unicode Collation Algorithm";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unicode-data.nix b/pkgs/unicode-data.nix
index 8d33b099011db2f8d9c9bc45dc82fc71fbe19b45..637a14c2f6ac35307d5554c09085f51913e75f0d 100644
--- a/pkgs/unicode-data.nix
+++ b/pkgs/unicode-data.nix
@@ -1,22 +1,15 @@
-{ mkDerivation
-, base
-, deepseq
-, hspec
-, hspec-discover
-, lib
-, tasty
-, tasty-bench
-}:
+{ mkDerivation, base, deepseq, hspec, lib, tasty, tasty-bench }:
 mkDerivation {
   pname = "unicode-data";
-  version = "0.3.1";
-  sha256 = "be1f815497a7c4d46395ba6dfc49f811a9716a670381f89f102b7df0f0f35c60";
+  version = "0.4.0.1";
+  sha256 = "37a5dea6801940beb65c4ac4b9d0f7e653a686cf773507f0ca61c210e0b06080";
+  revision = "1";
+  editedCabalFile = "1lvsn8r1xh8ip5gyrbwv7pk41yf2ynjimpd6g4am3n7j92djc7h8";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [ base hspec ];
-  testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Access Unicode Character Database (UCD)";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unicode-transforms.nix b/pkgs/unicode-transforms.nix
index bcaf400ab47552527af990304cf592a00c72e514..fcbbb0d8fdb3078c66e6ff6ed9e776d898653224 100644
--- a/pkgs/unicode-transforms.nix
+++ b/pkgs/unicode-transforms.nix
@@ -1,53 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, deepseq
-, filepath
-, ghc-prim
-, hspec
-, lib
-, path
-, path-io
-, split
-, tasty-bench
-, text
+{ mkDerivation, QuickCheck, base, bytestring, deepseq, filepath
+, ghc-prim, hspec, lib, path, path-io, split, tasty-bench, text
 , unicode-data
 }:
 mkDerivation {
   pname = "unicode-transforms";
   version = "0.4.0.1";
   sha256 = "3278e1e1d648da4bcd7368658ae091a89080e88a2f44db9df5136711e99649fc";
-  revision = "2";
-  editedCabalFile = "1imm3svpz2shilj2kmmmcyy5yd4c1mpmz5v1gvjrr98hrab2i9x7";
+  revision = "3";
+  editedCabalFile = "1hx6v04g4g1d8y8nm26k7vkhgfqmcch5xhvljlz67grw0j5d1zxd";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ghc-prim
-    text
-    unicode-data
+    base bytestring ghc-prim text unicode-data
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    hspec
-    QuickCheck
-    split
-    text
-    unicode-data
+    base bytestring deepseq hspec QuickCheck split text unicode-data
   ];
   benchmarkHaskellDepends = [
-    base
-    deepseq
-    filepath
-    path
-    path-io
-    tasty-bench
-    text
+    base deepseq filepath path path-io tasty-bench text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +31,4 @@ mkDerivation {
   description = "Unicode normalization";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/universe-base.nix b/pkgs/universe-base.nix
index 90043a0e1c9f472a5236c17675ff5fab387fca26..b07085d7f24f125f61e66a220498ac98b7749f69 100644
--- a/pkgs/universe-base.nix
+++ b/pkgs/universe-base.nix
@@ -1,17 +1,10 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, lib
-, tagged
+{ mkDerivation, QuickCheck, base, containers, lib, tagged
 , transformers
 }:
 mkDerivation {
   pname = "universe-base";
-  version = "1.1.3";
-  sha256 = "c59dfe99b76435d13483eff888e020a282ae8451b7b692dc98f348dcec95db52";
-  revision = "3";
-  editedCabalFile = "0hnd5vxsncwyjsindfmsvp9jbixanhmzczhrmd8s8g6imgb0mzyk";
+  version = "1.1.3.1";
+  sha256 = "a3e7ef305d79c58caa25276929f0cd2c129468484502b93b7f9b3b7b77e5732d";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -28,4 +21,4 @@ mkDerivation {
   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/unix-compat.nix b/pkgs/unix-compat.nix
index 7f6c859fa73caa9b87925eb0bea351f7a4f3d03e..90609809174b0d286bbf36424aad3f46e0d4ad5e 100644
--- a/pkgs/unix-compat.nix
+++ b/pkgs/unix-compat.nix
@@ -1,36 +1,16 @@
-{ mkDerivation
-, HUnit
-, base
-, directory
-, extra
-, fetchgit
-, hspec
-, lib
-, monad-parallel
-, temporary
-, unix
+{ mkDerivation, HUnit, base, directory, extra, hspec, lib
+, monad-parallel, temporary, unix
 }:
 mkDerivation {
   pname = "unix-compat";
   version = "0.7";
-  src = fetchgit {
-    url = "https://github.com/mitchellwrosen/fork--unix-compat";
-    sha256 = "05bnsbaswlsjgb8hrvabwdxzj4ii0kabj8mk47iczlwks6rimlgl";
-    rev = "f28060acd449643d267954647c1bb7c748c35fa9";
-    fetchSubmodules = true;
-  };
+  sha256 = "2b75ca79e0f7368f915f01ca6a5201f7df58ada46b9e4869bca1b92d853f2e3e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base unix ];
   testHaskellDepends = [
-    base
-    directory
-    extra
-    hspec
-    HUnit
-    monad-parallel
-    temporary
+    base directory extra hspec HUnit monad-parallel temporary
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,8 +19,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/jacobstanley/unix-compat";
+  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
index 2d428e63e2e2d47b7770cbe872809e1d910752e9..17057ee53ecffde7663da7d4188d43b0e1136a44 100644
--- a/pkgs/unix-time.nix
+++ b/pkgs/unix-time.nix
@@ -1,31 +1,16 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, hspec
-, hspec-discover
-, lib
-, old-locale
-, old-time
-, time
+{ mkDerivation, QuickCheck, base, binary, bytestring, hspec
+, hspec-discover, lib, old-locale, old-time, time
 }:
 mkDerivation {
   pname = "unix-time";
-  version = "0.4.8";
-  sha256 = "fedeb6a11bcb5396f50a30166a6bb05e56fc9866be4066718404bd8940ace843";
+  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
+    base bytestring hspec old-locale old-time QuickCheck time
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -38,4 +23,4 @@ mkDerivation {
   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
index 39a1e5542b614e043c5eb62296252b944f7500cd..a50863f4b38b27c153fa45fc40231348b9548f6f 100644
--- a/pkgs/unliftio-core.nix
+++ b/pkgs/unliftio-core.nix
@@ -1,10 +1,10 @@
 { mkDerivation, base, lib, transformers }:
 mkDerivation {
   pname = "unliftio-core";
-  version = "0.2.0.1";
-  sha256 = "919f0d1297ea2f5373118553c1df2a9405d8b9e31a8307e829da67d4953c299a";
-  revision = "2";
-  editedCabalFile = "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr";
+  version = "0.2.1.0";
+  sha256 = "99384cba8d56d9d61b85e38a313a93ebcdb78be6566367f0930ef580597fe3e3";
+  revision = "1";
+  editedCabalFile = "19pw6f7hmka8kgnsbrrhp73rdnvdsmagh1s325rxqv5if1km1hwz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   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
index a3843310c206eb93c6da2f19cebbc644f0d9479a..2b0b5e195968f336aa11607c5f55170090b929ec 100644
--- a/pkgs/unliftio.nix
+++ b/pkgs/unliftio.nix
@@ -1,78 +1,26 @@
-{ mkDerivation
-, QuickCheck
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, gauge
-, hspec
-, lib
-, process
-, safe-exceptions
-, stm
-, time
-, transformers
-, unix
-, unliftio-core
+{ 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.23.0";
-  sha256 = "2d86a3deef6d801991aa6c837c5e6c0d3db916f33226be1428a5a04f626be4fd";
+  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
+    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
+    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
+    async base bytestring deepseq directory filepath gauge process
+    safe-exceptions stm time transformers unix unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -85,4 +33,4 @@ mkDerivation {
   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/validation-selective.nix b/pkgs/validation-selective.nix
index f84f00e3a036d5ed423dbf0bbc16076478ef0065..77f809bc4b75579fdcbd4776b9bdf7559853802e 100644
--- a/pkgs/validation-selective.nix
+++ b/pkgs/validation-selective.nix
@@ -1,30 +1,16 @@
-{ mkDerivation
-, base
-, deepseq
-, doctest
-, hedgehog
-, hspec
-, hspec-hedgehog
-, lib
-, selective
-, text
+{ mkDerivation, base, deepseq, doctest, hedgehog, hspec
+, hspec-hedgehog, lib, selective, text
 }:
 mkDerivation {
   pname = "validation-selective";
-  version = "0.1.0.2";
-  sha256 = "016fde31529afad0cfe70ec3215fa85e38147582248696af6b135df950655bbf";
+  version = "0.2.0.0";
+  sha256 = "9a884e97e6a64f2cacadec8d5ea7e8ba7562d0c8fa9ab7cd5c34055eaec64987";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq selective ];
   testHaskellDepends = [
-    base
-    doctest
-    hedgehog
-    hspec
-    hspec-hedgehog
-    selective
-    text
+    base doctest hedgehog hspec hspec-hedgehog selective text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Lighweight pure data validation based on Applicative and Selective functors";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vty.nix b/pkgs/vty.nix
index 110b274d7d4244e6eea71b3fe761bf204394ec5a..4ad9e083d66e15747318296ba41d544112171c9c 100644
--- a/pkgs/vty.nix
+++ b/pkgs/vty.nix
@@ -1,105 +1,22 @@
-{ mkDerivation
-, Cabal
-, HUnit
-, QuickCheck
-, ansi-terminal
-, base
-, binary
-, blaze-builder
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, hashable
-, lib
-, microlens
-, microlens-mtl
-, microlens-th
-, mtl
-, parallel
-, parsec
-, quickcheck-assertions
-, random
-, smallcheck
-, stm
-, string-qq
-, terminfo
-, test-framework
-, test-framework-hunit
-, test-framework-smallcheck
-, text
-, transformers
-, unix
-, utf8-string
-, vector
+{ 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.37";
-  sha256 = "67e1376b735232c3a5e7fa3c3eff00fdc457bdd5ba7dcf3a758aee6b8b60cdf0";
+  version = "5.38";
+  sha256 = "54812f4d6f20d5c6308dd0b8279be6b94988e6a32813c1902c15b6c0722648a3";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    binary
-    blaze-builder
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    hashable
-    microlens
-    microlens-mtl
-    microlens-th
-    mtl
-    parallel
-    parsec
-    stm
-    terminfo
-    text
-    transformers
-    unix
-    utf8-string
-    vector
+    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
-  ];
-  testHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    Cabal
-    containers
-    deepseq
-    HUnit
-    microlens
-    microlens-mtl
-    mtl
-    QuickCheck
-    quickcheck-assertions
-    random
-    smallcheck
-    stm
-    string-qq
-    terminfo
-    test-framework
-    test-framework-hunit
-    test-framework-smallcheck
-    text
-    unix
-    utf8-string
-    vector
+    base containers directory filepath microlens microlens-mtl mtl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -112,4 +29,4 @@ mkDerivation {
   description = "A simple terminal UI library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/warp-tls.nix b/pkgs/warp-tls.nix
index 943fe39dbaea72907bfb164711848b8f14207a80..366f864c2535323d1d45b8135681d45c07f85560 100644
--- a/pkgs/warp-tls.nix
+++ b/pkgs/warp-tls.nix
@@ -1,36 +1,17 @@
-{ mkDerivation
-, base
-, bytestring
-, cryptonite
-, data-default-class
-, lib
-, network
-, streaming-commons
-, tls
-, tls-session-manager
-, unliftio
-, wai
-, warp
+{ mkDerivation, base, bytestring, cryptonite, data-default-class
+, lib, network, recv, streaming-commons, tls, tls-session-manager
+, unliftio, wai, warp
 }:
 mkDerivation {
   pname = "warp-tls";
-  version = "3.3.3";
-  sha256 = "5c44be7a903b863b330d1b9c152100ed7d1709f972e25401018bab407d3f69a0";
+  version = "3.3.5";
+  sha256 = "87e55aa5688d3d86fec6e23e0796af9d8816956506d5eb13e737cad2dbd7a9f0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cryptonite
-    data-default-class
-    network
-    streaming-commons
-    tls
-    tls-session-manager
-    unliftio
-    wai
-    warp
+    base bytestring cryptonite data-default-class network recv
+    streaming-commons tls tls-session-manager unliftio wai warp
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +24,4 @@ mkDerivation {
   description = "HTTP over TLS support for Warp via the TLS package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/warp.nix b/pkgs/warp.nix
index feddd434cd0daaba31961556451a314c850f4395..e608e29e5f8b52d8d4182cefb3121fc1b43aee09 100644
--- a/pkgs/warp.nix
+++ b/pkgs/warp.nix
@@ -1,129 +1,35 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, array
-, async
-, 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
-, simple-sendfile
-, stm
-, streaming-commons
-, text
-, time
-, time-manager
-, unix
-, unix-compat
-, unliftio
-, vault
-, wai
-, word8
+{ 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
 }:
 mkDerivation {
   pname = "warp";
-  version = "3.3.22";
-  sha256 = "ea26386fa12f86bc8d04446cc551ccc5c918debe4ad947f6c6bf514da3f04f3e";
+  version = "3.3.25";
+  sha256 = "ea7d18f031898b5d8d0fa2306ed27a08d6b0a3dc223f84961423aab36d1446f1";
   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
-    simple-sendfile
-    stm
-    streaming-commons
-    text
-    time-manager
-    unix
-    unix-compat
-    unliftio
-    vault
-    wai
-    word8
-    x509
+    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
   ];
   testHaskellDepends = [
-    array
-    async
-    auto-update
-    base
-    bsb-http-chunked
-    bytestring
-    case-insensitive
-    containers
-    directory
-    ghc-prim
-    hashable
-    hspec
-    http-client
-    http-date
-    http-types
-    http2
-    HUnit
-    iproute
-    network
-    process
-    QuickCheck
-    simple-sendfile
-    stm
-    streaming-commons
-    text
-    time
-    time-manager
-    unix
-    unix-compat
-    unliftio
-    vault
-    wai
-    word8
-    x509
+    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
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    auto-update
-    base
-    bytestring
-    containers
-    gauge
-    hashable
-    http-date
-    http-types
-    network
-    time-manager
-    unix
-    unix-compat
-    unliftio
-    x509
+    auto-update base bytestring containers gauge hashable http-date
+    http-types network recv time-manager unix unix-compat unliftio x509
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -136,4 +42,4 @@ mkDerivation {
   description = "A fast, light-weight web server for WAI applications";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wide-word.nix b/pkgs/wide-word.nix
index 913fa1c0a07ca0c268eda1b32a9976624c12c1be..c78c14798cf738fb0e9eebfb06df8a57a06969aa 100644
--- a/pkgs/wide-word.nix
+++ b/pkgs/wide-word.nix
@@ -1,41 +1,22 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, deepseq
-, ghc-prim
-, hashable
-, hedgehog
-, lib
-, primitive
-, quickcheck-classes
+{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq
+, ghc-prim, hashable, hedgehog, lib, primitive, quickcheck-classes
 , semirings
 }:
 mkDerivation {
   pname = "wide-word";
-  version = "0.1.3.0";
-  sha256 = "b28ff1f7662e11b3678dc20362f454be093d447b704abfc3f842e5717fd9e00d";
+  version = "0.1.5.0";
+  sha256 = "a732e9fe6eb2c52c744e2250c908126eee4f558ca2d2117a5e6b48023b5b41c0";
   revision = "1";
-  editedCabalFile = "1y1w3ih92dni6bzp4w1hcwn96ahdrk34lmqrgkri2dcdkykwyqwb";
+  editedCabalFile = "0l2rhhj907fa4ydzd03li7g66fkmhk5iyzks1chc9d7wf4ddgplv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    ghc-prim
-    hashable
-    primitive
+    base binary deepseq ghc-prim hashable primitive
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    ghc-prim
-    hedgehog
-    primitive
-    QuickCheck
-    quickcheck-classes
-    semirings
+    base binary bytestring ghc-prim hedgehog primitive QuickCheck
+    quickcheck-classes semirings
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +29,4 @@ mkDerivation {
   description = "Data types for large but fixed width signed and unsigned integers";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wreq.nix b/pkgs/wreq.nix
index 6a610c27ac022810816f86163ed0d58b53a14521..3ad77d4e507373d1b4117c9c49505e7c9da54746 100644
--- a/pkgs/wreq.nix
+++ b/pkgs/wreq.nix
@@ -1,118 +1,36 @@
-{ mkDerivation
-, Cabal
-, HUnit
-, QuickCheck
-, aeson
-, aeson-pretty
-, attoparsec
-, authenticate-oauth
-, base
-, base16-bytestring
-, base64-bytestring
-, bytestring
-, cabal-doctest
-, case-insensitive
-, containers
-, cryptonite
-, directory
-, doctest
-, exceptions
-, filepath
-, ghc-prim
-, hashable
-, http-client
-, http-client-tls
-, http-types
-, lens
-, lens-aeson
-, lib
-, memory
-, mime-types
-, network-info
-, psqueues
-, snap-core
-, snap-server
-, template-haskell
-, temporary
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, time
-, time-locale-compat
-, transformers
-, unix-compat
-, unordered-containers
-, uuid
-, vector
+{ mkDerivation, Cabal, HUnit, QuickCheck, aeson, aeson-pretty
+, attoparsec, authenticate-oauth, base, base16-bytestring
+, base64-bytestring, bytestring, cabal-doctest, case-insensitive
+, containers, cryptonite, directory, doctest, exceptions, filepath
+, ghc-prim, hashable, http-client, http-client-tls, http-types
+, lens, lens-aeson, lib, memory, mime-types, network-info, psqueues
+, snap-core, snap-server, template-haskell, temporary
+, test-framework, test-framework-hunit, test-framework-quickcheck2
+, text, time, time-locale-compat, transformers, unix-compat
+, unordered-containers, uuid, vector
 }:
 mkDerivation {
   pname = "wreq";
-  version = "0.5.3.3";
-  sha256 = "bcf31dd31f7c8d023ec36170f1bb4bd187906dd277d05a15dc27838b0808657f";
+  version = "0.5.4.0";
+  sha256 = "c528617d5aeab9aa60463221f4ed21a24090dfd8d015bb67e2959bfc938ac471";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    authenticate-oauth
-    base
-    base16-bytestring
-    bytestring
-    case-insensitive
-    containers
-    cryptonite
-    exceptions
-    ghc-prim
-    hashable
-    http-client
-    http-client-tls
-    http-types
-    lens
-    lens-aeson
-    memory
-    mime-types
-    psqueues
-    template-haskell
-    text
-    time
-    time-locale-compat
-    unordered-containers
+    aeson attoparsec authenticate-oauth base base16-bytestring
+    bytestring case-insensitive containers cryptonite exceptions
+    ghc-prim hashable http-client http-client-tls http-types lens
+    lens-aeson memory mime-types psqueues template-haskell text time
+    time-locale-compat unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    base64-bytestring
-    bytestring
-    case-insensitive
-    containers
-    directory
-    doctest
-    filepath
-    hashable
-    http-client
-    http-types
-    HUnit
-    lens
-    lens-aeson
-    network-info
-    QuickCheck
-    snap-core
-    snap-server
-    temporary
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    time
-    transformers
-    unix-compat
-    unordered-containers
-    uuid
-    vector
+    aeson aeson-pretty base base64-bytestring bytestring
+    case-insensitive containers directory doctest filepath hashable
+    http-client http-types HUnit lens lens-aeson network-info
+    QuickCheck snap-core snap-server temporary test-framework
+    test-framework-hunit test-framework-quickcheck2 text time
+    transformers unix-compat unordered-containers uuid vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -125,4 +43,4 @@ mkDerivation {
   description = "An easy-to-use HTTP client library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wuss.nix b/pkgs/wuss.nix
index 0cd8e57b5dbf84dbf921c23e82f922cc9d6cf44a..adeafec73fa24c48345ea3d72f74166c8f662070 100644
--- a/pkgs/wuss.nix
+++ b/pkgs/wuss.nix
@@ -1,24 +1,15 @@
-{ mkDerivation
-, base
-, bytestring
-, connection
-, lib
-, network
-, websockets
+{ mkDerivation, base, bytestring, connection, exceptions, lib
+, network, websockets
 }:
 mkDerivation {
   pname = "wuss";
-  version = "2.0.0.2";
-  sha256 = "02a04d38c11b1046ade12d35bbd9f165429ed02f554b06abf7b8fb4fd7c05812";
+  version = "2.0.1.3";
+  sha256 = "67501f9d44cfc6804494952772d03eaf0c1baea6f827179df8b5dc5c49d7ed0c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    connection
-    network
-    websockets
+    base bytestring connection exceptions network websockets
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,4 +21,4 @@ mkDerivation {
   description = "Secure WebSocket (WSS) clients";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/yaml.nix b/pkgs/yaml.nix
index 9d4acacf8227f6a1c7b43cb248345b2aac957e7f..afd3d15b2c6e1a5b97d15a8243696d5acd940a71 100644
--- a/pkgs/yaml.nix
+++ b/pkgs/yaml.nix
@@ -1,82 +1,27 @@
-{ 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, 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.8.0";
-  sha256 = "f61a4e829bb75e17f5da39ea7b9d8d221a100a0f0cb1258bb9584a1829cd0ae8";
-  revision = "2";
-  editedCabalFile = "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l";
+  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
+    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
+    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;
@@ -89,4 +34,4 @@ mkDerivation {
   description = "Support for parsing and rendering YAML documents";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/zip-archive.nix b/pkgs/zip-archive.nix
index e66f5842a711a3b8a1acae26981ac66f6f088c64..50369811a4f843748852fc0ef5fbe8deb0143b8f 100644
--- a/pkgs/zip-archive.nix
+++ b/pkgs/zip-archive.nix
@@ -1,56 +1,20 @@
-{ mkDerivation
-, HUnit
-, array
-, base
-, binary
-, bytestring
-, containers
-, digest
-, directory
-, filepath
-, lib
-, mtl
-, pretty
-, process
-, temporary
-, text
-, time
-, unix
-, which
-, zlib
+{ mkDerivation, HUnit, array, base, binary, bytestring, containers
+, digest, directory, filepath, lib, mtl, pretty, process, temporary
+, text, time, unix, which, zlib
 }:
 mkDerivation {
   pname = "zip-archive";
-  version = "0.4.2.2";
-  sha256 = "a4016b404356e5fe38a89fceb8c88b01251f7e3fe7832323a50a3f732a346709";
+  version = "0.4.3";
+  sha256 = "68050fa0f139848db0ea422ea9af1a65b652abf5168db7dafaf1bded5b045d05";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    binary
-    bytestring
-    containers
-    digest
-    directory
-    filepath
-    mtl
-    pretty
-    text
-    time
-    unix
-    zlib
+    array base binary bytestring containers digest directory filepath
+    mtl pretty text time unix zlib
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    HUnit
-    process
-    temporary
-    time
+    base bytestring directory filepath HUnit process temporary time
     unix
   ];
   testToolDepends = [ which ];
@@ -65,4 +29,4 @@ mkDerivation {
   description = "Library for creating and modifying zip archives";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file